equal
deleted
inserted
replaced
1533 """ |
1533 """ |
1534 source = ui.expandpath(source) |
1534 source = ui.expandpath(source) |
1535 setremoteconfig(ui, opts) |
1535 setremoteconfig(ui, opts) |
1536 |
1536 |
1537 other = hg.repository(ui, source) |
1537 other = hg.repository(ui, source) |
|
1538 ui.status(_('comparing with %s\n') % source) |
1538 incoming = repo.findincoming(other, force=opts["force"]) |
1539 incoming = repo.findincoming(other, force=opts["force"]) |
1539 if not incoming: |
1540 if not incoming: |
1540 try: |
1541 try: |
1541 os.unlink(opts["bundle"]) |
1542 os.unlink(opts["bundle"]) |
1542 except: |
1543 except: |
1817 revs = None |
1818 revs = None |
1818 if opts['rev']: |
1819 if opts['rev']: |
1819 revs = [repo.lookup(rev) for rev in opts['rev']] |
1820 revs = [repo.lookup(rev) for rev in opts['rev']] |
1820 |
1821 |
1821 other = hg.repository(ui, dest) |
1822 other = hg.repository(ui, dest) |
|
1823 ui.status(_('comparing with %s\n') % dest) |
1822 o = repo.findoutgoing(other, force=opts['force']) |
1824 o = repo.findoutgoing(other, force=opts['force']) |
1823 if not o: |
1825 if not o: |
1824 ui.status(_("no changes found\n")) |
1826 ui.status(_("no changes found\n")) |
1825 return 1 |
1827 return 1 |
1826 o = repo.changelog.nodesbetween(o, revs)[0] |
1828 o = repo.changelog.nodesbetween(o, revs)[0] |