equal
deleted
inserted
replaced
106 b'multiple heads in this branch ' |
106 b'multiple heads in this branch ' |
107 b'(use "hg heads ." and "hg merge" to merge)' |
107 b'(use "hg heads ." and "hg merge" to merge)' |
108 ) |
108 ) |
109 ) |
109 ) |
110 |
110 |
111 path = urlutil.get_unique_pull_path(b'fetch', repo, ui, source)[0] |
111 path = urlutil.get_unique_pull_path_obj(b'fetch', ui, source) |
112 other = hg.peer(repo, opts, path) |
112 other = hg.peer(repo, opts, path) |
113 ui.status(_(b'pulling from %s\n') % urlutil.hidepassword(path)) |
113 ui.status(_(b'pulling from %s\n') % urlutil.hidepassword(path.loc)) |
114 revs = None |
114 revs = None |
115 if opts[b'rev']: |
115 if opts[b'rev']: |
116 try: |
116 try: |
117 revs = [other.lookup(rev) for rev in opts[b'rev']] |
117 revs = [other.lookup(rev) for rev in opts[b'rev']] |
118 except error.CapabilityError: |
118 except error.CapabilityError: |