2213 they are stored as a file named ".hgtags" which is managed |
2213 they are stored as a file named ".hgtags" which is managed |
2214 similarly to other project files and can be hand-edited if |
2214 similarly to other project files and can be hand-edited if |
2215 necessary. The file '.hg/localtags' is used for local tags (not |
2215 necessary. The file '.hg/localtags' is used for local tags (not |
2216 shared among repositories). |
2216 shared among repositories). |
2217 """ |
2217 """ |
2218 if name in ['tip', '.']: |
2218 if name in ['tip', '.', 'null']: |
2219 raise util.Abort(_("the name '%s' is reserved") % name) |
2219 raise util.Abort(_("the name '%s' is reserved") % name) |
2220 if rev_ is not None: |
2220 if rev_ is not None: |
2221 ui.warn(_("use of 'hg tag NAME [REV]' is deprecated, " |
2221 ui.warn(_("use of 'hg tag NAME [REV]' is deprecated, " |
2222 "please use 'hg tag [-r REV] NAME' instead\n")) |
2222 "please use 'hg tag [-r REV] NAME' instead\n")) |
2223 if opts['rev']: |
2223 if opts['rev']: |
2273 """ |
2273 """ |
2274 gen = changegroup.readbundle(urllib.urlopen(fname)) |
2274 gen = changegroup.readbundle(urllib.urlopen(fname)) |
2275 modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname) |
2275 modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname) |
2276 return postincoming(ui, repo, modheads, opts['update']) |
2276 return postincoming(ui, repo, modheads, opts['update']) |
2277 |
2277 |
2278 def update(ui, repo, node=None, merge=False, clean=False, force=None, |
2278 def update(ui, repo, node=None, clean=False, branch=None): |
2279 branch=None): |
|
2280 """update or merge working directory |
2279 """update or merge working directory |
2281 |
2280 |
2282 Update the working directory to the specified revision. |
2281 Update the working directory to the specified revision. |
2283 |
2282 |
2284 If there are no outstanding changes in the working directory and |
2283 If there are no outstanding changes in the working directory and |
2719 _('hg unbundle [-u] FILE')), |
2718 _('hg unbundle [-u] FILE')), |
2720 "^update|up|checkout|co": |
2719 "^update|up|checkout|co": |
2721 (update, |
2720 (update, |
2722 [('b', 'branch', '', |
2721 [('b', 'branch', '', |
2723 _('checkout the head of a specific branch (DEPRECATED)')), |
2722 _('checkout the head of a specific branch (DEPRECATED)')), |
2724 ('m', 'merge', None, _('allow merging of branches (DEPRECATED)')), |
2723 ('C', 'clean', None, _('overwrite locally modified files'))], |
2725 ('C', 'clean', None, _('overwrite locally modified files')), |
2724 _('hg update [-C] [REV]')), |
2726 ('f', 'force', None, _('force a merge with outstanding changes'))], |
|
2727 _('hg update [-C] [-f] [REV]')), |
|
2728 "verify": (verify, [], _('hg verify')), |
2725 "verify": (verify, [], _('hg verify')), |
2729 "version": (version_, [], _('hg version')), |
2726 "version": (version_, [], _('hg version')), |
2730 } |
2727 } |
2731 |
2728 |
2732 norepo = ("clone init version help debugancestor debugcomplete debugdata" |
2729 norepo = ("clone init version help debugancestor debugcomplete debugdata" |