Show More
@@ -5431,12 +5431,12 b' def pull(ui, repo, *sources, **opts):' | |||||
5431 | raise error.InputError(msg, hint=hint) |
|
5431 | raise error.InputError(msg, hint=hint) | |
5432 |
|
5432 | |||
5433 | for path in urlutil.get_pull_paths(repo, ui, sources): |
|
5433 | for path in urlutil.get_pull_paths(repo, ui, sources): | |
5434 | source, branches = urlutil.parseurl(path.rawloc, opts.get(b'branch')) |
|
5434 | ui.status(_(b'pulling from %s\n') % urlutil.hidepassword(path.loc)) | |
5435 | ui.status(_(b'pulling from %s\n') % urlutil.hidepassword(source)) |
|
|||
5436 | ui.flush() |
|
5435 | ui.flush() | |
5437 |
other = hg.peer(repo, opts, |
|
5436 | other = hg.peer(repo, opts, path) | |
5438 | update_conflict = None |
|
5437 | update_conflict = None | |
5439 | try: |
|
5438 | try: | |
|
5439 | branches = (path.branch, opts.get(b'branch', [])) | |||
5440 | revs, checkout = hg.addbranchrevs( |
|
5440 | revs, checkout = hg.addbranchrevs( | |
5441 | repo, other, branches, opts.get(b'rev') |
|
5441 | repo, other, branches, opts.get(b'rev') | |
5442 | ) |
|
5442 | ) | |
@@ -5512,8 +5512,12 b' def pull(ui, repo, *sources, **opts):' | |||||
5512 | elif opts.get(b'branch'): |
|
5512 | elif opts.get(b'branch'): | |
5513 | brev = opts[b'branch'][0] |
|
5513 | brev = opts[b'branch'][0] | |
5514 | else: |
|
5514 | else: | |
5515 |
brev = branch |
|
5515 | brev = path.branch | |
5516 | repo._subtoppath = source |
|
5516 | ||
|
5517 | # XXX path: we are losing the `path` object here. Keeping it | |||
|
5518 | # would be valuable. For example as a "variant" as we do | |||
|
5519 | # for pushes. | |||
|
5520 | repo._subtoppath = path.loc | |||
5517 | try: |
|
5521 | try: | |
5518 | update_conflict = postincoming( |
|
5522 | update_conflict = postincoming( | |
5519 | ui, repo, modheads, opts.get(b'update'), checkout, brev |
|
5523 | ui, repo, modheads, opts.get(b'update'), checkout, brev |
General Comments 0
You need to be logged in to leave comments.
Login now