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