equal
deleted
inserted
replaced
58 bheads = [head for head in bheads if len(repo[head].children()) == 0] |
58 bheads = [head for head in bheads if len(repo[head].children()) == 0] |
59 if len(bheads) > 1: |
59 if len(bheads) > 1: |
60 raise util.Abort(_('multiple heads in this branch ' |
60 raise util.Abort(_('multiple heads in this branch ' |
61 '(use "hg heads ." and "hg merge" to merge)')) |
61 '(use "hg heads ." and "hg merge" to merge)')) |
62 |
62 |
63 cmdutil.setremoteconfig(ui, opts) |
63 other = hg.repository(cmdutil.remoteui(repo, opts), |
64 |
64 ui.expandpath(source)) |
65 other = hg.repository(ui, ui.expandpath(source)) |
|
66 ui.status(_('pulling from %s\n') % |
65 ui.status(_('pulling from %s\n') % |
67 url.hidepassword(ui.expandpath(source))) |
66 url.hidepassword(ui.expandpath(source))) |
68 revs = None |
67 revs = None |
69 if opts['rev']: |
68 if opts['rev']: |
70 if not other.local(): |
69 if not other.local(): |