Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/commands.py @ 3859:8c24b6fd5866

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix errors spotted by pychecker
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sun, 10 Dec 2006 19:41:57 +0100
parents 7c12958eba26
children 46abbed02b2d
comparison
equal deleted inserted replaced
3858:7c12958eba26 3859:8c24b6fd5866
2472 """apply a changegroup file 2472 """apply a changegroup file
2473 2473
2474 Apply a compressed changegroup file generated by the bundle 2474 Apply a compressed changegroup file generated by the bundle
2475 command. 2475 command.
2476 """ 2476 """
2477 gen = changegroup.readbundle(urllib.urlopen(fname)) 2477 gen = changegroup.readbundle(urllib.urlopen(fname), fname)
2478 modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname) 2478 modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname)
2479 return postincoming(ui, repo, modheads, opts['update']) 2479 return postincoming(ui, repo, modheads, opts['update'])
2480 2480
2481 def update(ui, repo, node=None, clean=False, branch=None, date=None): 2481 def update(ui, repo, node=None, clean=False, branch=None, date=None):
2482 """update or merge working directory 2482 """update or merge working directory