Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/commands.py @ 516:873228c2f6cf
Change getchangegroup to findincoming
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Change getchangegroup to findincoming
manifest hash: 46dbdc025ead342f7c70a0051d1c596cfcbb6699
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCwuwAywK+sNU5EO8RAoV/AJ9GaoLTKMo2aoycSIZyBt/8r073vQCeK/tO
W1PwSot4HmnmcpR6RVIy9+0=
=PiBt
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Wed, 29 Jun 2005 10:44:16 -0800 |
parents | 03f27b1381f9 |
children | 9b884be92af2 |
comparison
equal
deleted
inserted
replaced
515:03f27b1381f9 | 516:873228c2f6cf |
---|---|
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: |