2726 % fname) |
2726 % fname) |
2727 gen = generator(util.filechunkiter(f, 4096)) |
2727 gen = generator(util.filechunkiter(f, 4096)) |
2728 modheads = repo.addchangegroup(util.chunkbuffer(gen), 'unbundle', |
2728 modheads = repo.addchangegroup(util.chunkbuffer(gen), 'unbundle', |
2729 'bundle:' + fname) |
2729 'bundle:' + fname) |
2730 return postincoming(ui, repo, modheads, opts['update']) |
2730 return postincoming(ui, repo, modheads, opts['update']) |
2731 |
|
2732 def undo(ui, repo): |
|
2733 """undo the last commit or pull (DEPRECATED) |
|
2734 |
|
2735 (DEPRECATED) |
|
2736 This command is now deprecated and will be removed in a future |
|
2737 release. Please use the rollback command instead. For usage |
|
2738 instructions, see the rollback command. |
|
2739 """ |
|
2740 ui.warn(_('(the undo command is deprecated; use rollback instead)\n')) |
|
2741 repo.rollback() |
|
2742 |
2731 |
2743 def update(ui, repo, node=None, merge=False, clean=False, force=None, |
2732 def update(ui, repo, node=None, merge=False, clean=False, force=None, |
2744 branch=None): |
2733 branch=None): |
2745 """update or merge working directory |
2734 """update or merge working directory |
2746 |
2735 |
3167 "unbundle": |
3156 "unbundle": |
3168 (unbundle, |
3157 (unbundle, |
3169 [('u', 'update', None, |
3158 [('u', 'update', None, |
3170 _('update to new tip if changesets were unbundled'))], |
3159 _('update to new tip if changesets were unbundled'))], |
3171 _('hg unbundle [-u] FILE')), |
3160 _('hg unbundle [-u] FILE')), |
3172 "debugundo|undo": (undo, [], _('hg undo')), |
|
3173 "^update|up|checkout|co": |
3161 "^update|up|checkout|co": |
3174 (update, |
3162 (update, |
3175 [('b', 'branch', '', |
3163 [('b', 'branch', '', |
3176 _('checkout the head of a specific branch (DEPRECATED)')), |
3164 _('checkout the head of a specific branch (DEPRECATED)')), |
3177 ('m', 'merge', None, _('allow merging of branches (DEPRECATED)')), |
3165 ('m', 'merge', None, _('allow merging of branches (DEPRECATED)')), |