Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 1601:a1b25fb2e764

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Error handling for unbundle, fix option line wrapping
author Matt Mackall <mpm@selenic.com>
date Tue, 27 Dec 2005 16:18:00 -0600
parents 728fd9584993
children fb4149eebdd4
comparison
equal deleted inserted replaced
1600:728fd9584993 1601:a1b25fb2e764
2110 zd = bz2.BZ2Decompressor() 2110 zd = bz2.BZ2Decompressor()
2111 for chunk in f: 2111 for chunk in f:
2112 yield zd.decompress(chunk) 2112 yield zd.decompress(chunk)
2113 2113
2114 bzgen = bzgenerator(util.filechunkiter(f, 4096)) 2114 bzgen = bzgenerator(util.filechunkiter(f, 4096))
2115 repo.addchangegroup(util.chunkbuffer(bzgen)) 2115 if repo.addchangegroup(util.chunkbuffer(bzgen)):
2116 return 1
2117
2116 if opts['update']: 2118 if opts['update']:
2117 return update(ui, repo) 2119 return update(ui, repo)
2118 else: 2120 else:
2119 ui.status(_("(run 'hg update' to get a working copy)\n")) 2121 ui.status(_("(run 'hg update' to get a working copy)\n"))
2120 2122
2408 _('hg tag [OPTION]... NAME [REV]')), 2410 _('hg tag [OPTION]... NAME [REV]')),
2409 "tags": (tags, [], _('hg tags')), 2411 "tags": (tags, [], _('hg tags')),
2410 "tip": (tip, [], _('hg tip')), 2412 "tip": (tip, [], _('hg tip')),
2411 "unbundle": 2413 "unbundle":
2412 (unbundle, 2414 (unbundle,
2413 [('u', 'update', None, _('update the working directory to tip after unbundle'))], 2415 [('u', 'update', None,
2416 _('update the working directory to tip after unbundle'))],
2414 _('hg unbundle [-u] FILE')), 2417 _('hg unbundle [-u] FILE')),
2415 "undo": (undo, [], _('hg undo')), 2418 "undo": (undo, [], _('hg undo')),
2416 "^update|up|checkout|co": 2419 "^update|up|checkout|co":
2417 (update, 2420 (update,
2418 [('b', 'branch', "", _('checkout the head of a specific branch')), 2421 [('b', 'branch', "", _('checkout the head of a specific branch')),