equal
deleted
inserted
replaced
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 fetch = repo.findincoming(other) |
304 fetch = repo.findincoming(other) |
305 cg = other.changegroup(fetch) |
305 if fetch: |
306 repo.addchangegroup(cg) |
306 cg = other.changegroup(fetch) |
|
307 repo.addchangegroup(cg) |
307 |
308 |
308 f = repo.opener("hgrc", "w") |
309 f = repo.opener("hgrc", "w") |
309 f.write("[paths]\n") |
310 f.write("[paths]\n") |
310 f.write("default = %s\n" % source) |
311 f.write("default = %s\n" % source) |
311 |
312 |
547 |
548 |
548 ui.status('pulling from %s\n' % (source)) |
549 ui.status('pulling from %s\n' % (source)) |
549 |
550 |
550 other = hg.repository(ui, source) |
551 other = hg.repository(ui, source) |
551 fetch = repo.findincoming(other) |
552 fetch = repo.findincoming(other) |
|
553 if not fetch: |
|
554 ui.status("no changes found\n") |
|
555 return |
|
556 |
552 cg = other.changegroup(fetch) |
557 cg = other.changegroup(fetch) |
553 r = repo.addchangegroup(cg) |
558 r = repo.addchangegroup(cg) |
554 if cg and not r: |
559 if cg and not r: |
555 if opts['update']: |
560 if opts['update']: |
556 return update(ui, repo) |
561 return update(ui, repo) |