equal
deleted
inserted
replaced
2488 """apply a changegroup file |
2488 """apply a changegroup file |
2489 |
2489 |
2490 Apply a compressed changegroup file generated by the bundle |
2490 Apply a compressed changegroup file generated by the bundle |
2491 command. |
2491 command. |
2492 """ |
2492 """ |
2493 gen = changegroup.readbundle(urllib.urlopen(fname), fname) |
2493 if os.path.exists(fname): |
|
2494 f = open(fname) |
|
2495 else: |
|
2496 f = urllib.urlopen(fname) |
|
2497 gen = changegroup.readbundle(f, fname) |
2494 modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname) |
2498 modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname) |
2495 return postincoming(ui, repo, modheads, opts['update']) |
2499 return postincoming(ui, repo, modheads, opts['update']) |
2496 |
2500 |
2497 def update(ui, repo, node=None, clean=False, branch=None, date=None): |
2501 def update(ui, repo, node=None, clean=False, branch=None, date=None): |
2498 """update working directory |
2502 """update working directory |