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