2247 """ |
2247 """ |
2248 gen = changegroup.readbundle(urllib.urlopen(fname)) |
2248 gen = changegroup.readbundle(urllib.urlopen(fname)) |
2249 modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname) |
2249 modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname) |
2250 return postincoming(ui, repo, modheads, opts['update']) |
2250 return postincoming(ui, repo, modheads, opts['update']) |
2251 |
2251 |
2252 def update(ui, repo, node=None, merge=False, clean=False, force=None, |
2252 def update(ui, repo, node=None, clean=False, branch=None): |
2253 branch=None): |
|
2254 """update or merge working directory |
2253 """update or merge working directory |
2255 |
2254 |
2256 Update the working directory to the specified revision. |
2255 Update the working directory to the specified revision. |
2257 |
2256 |
2258 If there are no outstanding changes in the working directory and |
2257 If there are no outstanding changes in the working directory and |
2693 _('hg unbundle [-u] FILE')), |
2692 _('hg unbundle [-u] FILE')), |
2694 "^update|up|checkout|co": |
2693 "^update|up|checkout|co": |
2695 (update, |
2694 (update, |
2696 [('b', 'branch', '', |
2695 [('b', 'branch', '', |
2697 _('checkout the head of a specific branch (DEPRECATED)')), |
2696 _('checkout the head of a specific branch (DEPRECATED)')), |
2698 ('m', 'merge', None, _('allow merging of branches (DEPRECATED)')), |
2697 ('C', 'clean', None, _('overwrite locally modified files'))], |
2699 ('C', 'clean', None, _('overwrite locally modified files')), |
2698 _('hg update [-C] [REV]')), |
2700 ('f', 'force', None, _('force a merge with outstanding changes'))], |
|
2701 _('hg update [-C] [-f] [REV]')), |
|
2702 "verify": (verify, [], _('hg verify')), |
2699 "verify": (verify, [], _('hg verify')), |
2703 "version": (version_, [], _('hg version')), |
2700 "version": (version_, [], _('hg version')), |
2704 } |
2701 } |
2705 |
2702 |
2706 norepo = ("clone init version help debugancestor debugcomplete debugdata" |
2703 norepo = ("clone init version help debugancestor debugcomplete debugdata" |