Show More
@@ -2095,7 +2095,7 b' def tip(ui, repo):' | |||||
2095 | n = repo.changelog.tip() |
|
2095 | n = repo.changelog.tip() | |
2096 | show_changeset(ui, repo, changenode=n) |
|
2096 | show_changeset(ui, repo, changenode=n) | |
2097 |
|
2097 | |||
2098 | def unbundle(ui, repo, fname): |
|
2098 | def unbundle(ui, repo, fname, **opts): | |
2099 | """apply a changegroup file |
|
2099 | """apply a changegroup file | |
2100 |
|
2100 | |||
2101 | Apply a compressed changegroup file generated by the bundle |
|
2101 | Apply a compressed changegroup file generated by the bundle | |
@@ -2113,6 +2113,10 b' def unbundle(ui, repo, fname):' | |||||
2113 |
|
2113 | |||
2114 | bzgen = bzgenerator(util.filechunkiter(f, 4096)) |
|
2114 | bzgen = bzgenerator(util.filechunkiter(f, 4096)) | |
2115 | repo.addchangegroup(util.chunkbuffer(bzgen)) |
|
2115 | repo.addchangegroup(util.chunkbuffer(bzgen)) | |
|
2116 | if opts['update']: | |||
|
2117 | return update(ui, repo) | |||
|
2118 | else: | |||
|
2119 | ui.status(_("(run 'hg update' to get a working copy)\n")) | |||
2116 |
|
2120 | |||
2117 | def undo(ui, repo): |
|
2121 | def undo(ui, repo): | |
2118 | """undo the last commit or pull |
|
2122 | """undo the last commit or pull | |
@@ -2406,8 +2410,8 b' table = {' | |||||
2406 | "tip": (tip, [], _('hg tip')), |
|
2410 | "tip": (tip, [], _('hg tip')), | |
2407 | "unbundle": |
|
2411 | "unbundle": | |
2408 | (unbundle, |
|
2412 | (unbundle, | |
2409 | [], |
|
2413 | [('u', 'update', None, _('update the working directory to tip after unbundle'))], | |
2410 | _('hg unbundle FILE')), |
|
2414 | _('hg unbundle [-u] FILE')), | |
2411 | "undo": (undo, [], _('hg undo')), |
|
2415 | "undo": (undo, [], _('hg undo')), | |
2412 | "^update|up|checkout|co": |
|
2416 | "^update|up|checkout|co": | |
2413 | (update, |
|
2417 | (update, |
General Comments 0
You need to be logged in to leave comments.
Login now