equal
deleted
inserted
replaced
299 repo = hg.repository(ui, ".") |
299 repo = hg.repository(ui, ".") |
300 |
300 |
301 else: |
301 else: |
302 repo = hg.repository(ui, ".", create=1) |
302 repo = hg.repository(ui, ".", create=1) |
303 other = hg.repository(ui, source) |
303 other = hg.repository(ui, source) |
304 cg = repo.getchangegroup(other) |
304 fetch = repo.findincoming(other) |
|
305 cg = other.changegroup(fetch) |
305 repo.addchangegroup(cg) |
306 repo.addchangegroup(cg) |
306 |
307 |
307 f = repo.opener("hgrc", "w") |
308 f = repo.opener("hgrc", "w") |
308 f.write("[paths]\n") |
309 f.write("[paths]\n") |
309 f.write("default = %s\n" % source) |
310 f.write("default = %s\n" % source) |
545 source = ui.expandpath(source) |
546 source = ui.expandpath(source) |
546 |
547 |
547 ui.status('pulling from %s\n' % (source)) |
548 ui.status('pulling from %s\n' % (source)) |
548 |
549 |
549 other = hg.repository(ui, source) |
550 other = hg.repository(ui, source) |
550 cg = repo.getchangegroup(other) |
551 fetch = repo.findincoming(other) |
|
552 cg = other.changegroup(fetch) |
551 r = repo.addchangegroup(cg) |
553 r = repo.addchangegroup(cg) |
552 if cg and not r: |
554 if cg and not r: |
553 if opts['update']: |
555 if opts['update']: |
554 return update(ui, repo) |
556 return update(ui, repo) |
555 else: |
557 else: |