4014 source, branches = hg.parseurl(ui.expandpath('default')) |
4014 source, branches = hg.parseurl(ui.expandpath('default')) |
4015 other = hg.repository(hg.remoteui(repo, {}), source) |
4015 other = hg.repository(hg.remoteui(repo, {}), source) |
4016 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev')) |
4016 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev')) |
4017 ui.debug('comparing with %s\n' % util.hidepassword(source)) |
4017 ui.debug('comparing with %s\n' % util.hidepassword(source)) |
4018 repo.ui.pushbuffer() |
4018 repo.ui.pushbuffer() |
4019 common, incoming, rheads = discovery.findcommonincoming(repo, other) |
4019 commoninc = discovery.findcommonincoming(repo, other) |
|
4020 _common, incoming, _rheads = commoninc |
4020 repo.ui.popbuffer() |
4021 repo.ui.popbuffer() |
4021 if incoming: |
4022 if incoming: |
4022 t.append(_('1 or more incoming')) |
4023 t.append(_('1 or more incoming')) |
4023 |
4024 |
4024 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default')) |
4025 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default')) |
4025 revs, checkout = hg.addbranchrevs(repo, repo, branches, None) |
4026 revs, checkout = hg.addbranchrevs(repo, repo, branches, None) |
4026 other = hg.repository(hg.remoteui(repo, {}), dest) |
4027 if source != dest: |
4027 ui.debug('comparing with %s\n' % util.hidepassword(dest)) |
4028 other = hg.repository(hg.remoteui(repo, {}), dest) |
|
4029 commoninc = None |
|
4030 ui.debug('comparing with %s\n' % util.hidepassword(dest)) |
4028 repo.ui.pushbuffer() |
4031 repo.ui.pushbuffer() |
4029 common, outheads = discovery.findcommonoutgoing(repo, other) |
4032 common, outheads = discovery.findcommonoutgoing(repo, other, |
|
4033 commoninc=commoninc) |
4030 repo.ui.popbuffer() |
4034 repo.ui.popbuffer() |
4031 o = repo.changelog.findmissing(common=common, heads=outheads) |
4035 o = repo.changelog.findmissing(common=common, heads=outheads) |
4032 if o: |
4036 if o: |
4033 t.append(_('%d outgoing') % len(o)) |
4037 t.append(_('%d outgoing') % len(o)) |
4034 if 'bookmarks' in other.listkeys('namespaces'): |
4038 if 'bookmarks' in other.listkeys('namespaces'): |