mercurial-crew-with-dirclash: comparison mercurial/commands.py

equal deleted inserted replaced

-:f94dbc6c7eaf
+:06154aff2b1a
 # of the GNU General Public License, incorporated herein by reference.
 import demandimport; demandimport.enable()
 from node import *
 from i18n import _
-import bisect, os, re, sys, urllib, shlex, stat
+import os, re, sys, urllib
 import ui, hg, util, revlog, bundlerepo, extensions
 import difflib, patch, time, help, mdiff, tempfile
 import errno, version, socket
 import archival, changegroup, cmdutil, hgweb.server, sshserver
 for src, abs, rel, exact in cmdutil.walk(repo, pats, opts):
 if exact:
 if ui.verbose:
 ui.status(_('adding %s\n') % rel)
 names.append(abs)
-elif repo.dirstate.state(abs) == '?':
+elif abs not in repo.dirstate:
 ui.status(_('adding %s\n') % rel)
 names.append(abs)
 if not opts.get('dry_run'):
 repo.add(names)
 Without the -a option, annotate will avoid processing files it
 detects as binary. With -a, annotate will generate an annotation
 anyway, probably with undesirable results.
 """
-getdate = util.cachefunc(lambda x: util.datestr(x.date()))
+getdate = util.cachefunc(lambda x: util.datestr(x[0].date()))
 if not pats:
 raise util.Abort(_('at least one file name or pattern required'))
-opmap = [['user', lambda x: ui.shortuser(x.user())],
+opmap = [('user', lambda x: ui.shortuser(x[0].user())),
-['number', lambda x: str(x.rev())],
+('number', lambda x: str(x[0].rev())),
-['changeset', lambda x: short(x.node())],
+('changeset', lambda x: short(x[0].node())),
-['date', getdate], ['follow', lambda x: x.path()]]
+('date', getdate),
+('follow', lambda x: x[0].path()),
+]
 if (not opts['user'] and not opts['changeset'] and not opts['date']
 and not opts['follow']):
 opts['number'] = 1
+linenumber = opts.get('line_number') is not None
+if (linenumber and (not opts['changeset']) and (not opts['number'])):
+raise util.Abort(_('at least one of -n/-c is required for -l'))
+funcmap = [func for op, func in opmap if opts.get(op)]
+if linenumber:
+lastfunc = funcmap[-1]
+funcmap[-1] = lambda x: "%s:%s" % (lastfunc(x), x[1])
 ctx = repo.changectx(opts['rev'])
 for src, abs, rel, exact in cmdutil.walk(repo, pats, opts,
 node=ctx.node()):
 fctx = ctx.filectx(abs)
 if not opts['text'] and util.binary(fctx.data()):
 ui.write(_("%s: binary file\n") % ((pats and rel) or abs))
 continue
-lines = fctx.annotate(follow=opts.get('follow'))
+lines = fctx.annotate(follow=opts.get('follow'),
+linenumber=linenumber)
 pieces = []
-for o, f in opmap:
+for f in funcmap:
-if opts[o]:
+l = [f(n) for n, dummy in lines]
-l = [f(n) for n, dummy in lines]
+if l:
-if l:
+m = max(map(len, l))
-m = max(map(len, l))
+pieces.append(["%*s" % (m, x) for x in l])
-pieces.append(["%*s" % (m, x) for x in l])
 if pieces:
 for p, l in zip(zip(*pieces), lines):
 ui.write("%s: %s" % (" ".join(p), l[1]))
 will be committed.
 If no commit message is specified, the editor configured in your hgrc
 or in the EDITOR environment variable is started to enter a message.
 """
-message = cmdutil.logmessage(opts)
+def commitfunc(ui, repo, files, message, match, opts):
+return repo.commit(files, message, opts['user'], opts['date'], match,
-if opts['addremove']:
+force_editor=opts.get('force_editor'))
-cmdutil.addremove(repo, pats, opts)
+cmdutil.commit(ui, repo, commitfunc, pats, opts)
-fns, match, anypats = cmdutil.matchpats(repo, pats, opts)
-if pats:
+def docopy(ui, repo, pats, opts):
-status = repo.status(files=fns, match=match)
-modified, added, removed, deleted, unknown = status[:5]
-files = modified + added + removed
-slist = None
-for f in fns:
-if f == '.':
-continue
-if f not in files:
-rf = repo.wjoin(f)
-try:
-mode = os.lstat(rf)[stat.ST_MODE]
-except OSError:
-raise util.Abort(_("file %s not found!") % rf)
-if stat.S_ISDIR(mode):
-name = f + '/'
-if slist is None:
-slist = list(files)
-slist.sort()
-i = bisect.bisect(slist, name)
-if i >= len(slist) or not slist[i].startswith(name):
-raise util.Abort(_("no match under directory %s!")
-% rf)
-elif not (stat.S_ISREG(mode) or stat.S_ISLNK(mode)):
-raise util.Abort(_("can't commit %s: "
-"unsupported file type!") % rf)
-elif repo.dirstate.state(f) == '?':
-raise util.Abort(_("file %s not tracked!") % rf)
-else:
-files = []
-try:
-repo.commit(files, message, opts['user'], opts['date'], match,
-force_editor=opts.get('force_editor'))
-except ValueError, inst:
-raise util.Abort(str(inst))
-def docopy(ui, repo, pats, opts, wlock):
 # called with the repo lock held
 #
 # hgsep => pathname that uses "/" to separate directories
 # ossep => pathname that uses os.sep to separate directories
 cwd = repo.getcwd()
 # rel: ossep
 # return: hgsep
 def okaytocopy(abs, rel, exact):
 reasons = {'?': _('is not managed'),
 'r': _('has been marked for remove')}
-state = repo.dirstate.state(abs)
+state = repo.dirstate[abs]
 reason = reasons.get(state)
 if reason:
 if exact:
 ui.warn(_('%s: not copying - file %s\n') % (rel, reason))
 else:
 ui.warn(_('%s: not overwriting - %s collides with %s\n') %
 (reltarget, repo.pathto(abssrc, cwd),
 repo.pathto(prevsrc, cwd)))
 return
 if (not opts['after'] and os.path.exists(target) or
-opts['after'] and repo.dirstate.state(abstarget) not in '?ar'):
+opts['after'] and repo.dirstate[abstarget] in 'mn'):
 if not opts['force']:
 ui.warn(_('%s: not overwriting - file exists\n') %
 reltarget)
 return
 if not opts['after'] and not opts.get('dry_run'):
 else:
 targetdir = os.path.dirname(target) or '.'
 if not os.path.isdir(targetdir) and not opts.get('dry_run'):
 os.makedirs(targetdir)
 try:
-restore = repo.dirstate.state(abstarget) == 'r'
+restore = repo.dirstate[abstarget] == 'r'
 if restore and not opts.get('dry_run'):
-repo.undelete([abstarget], wlock)
+repo.undelete([abstarget])
 try:
 if not opts.get('dry_run'):
 util.copyfile(src, target)
 restore = False
 finally:
 if restore:
-repo.remove([abstarget], wlock=wlock)
+repo.remove([abstarget])
 except IOError, inst:
 if inst.errno == errno.ENOENT:
 ui.warn(_('%s: deleted in working copy\n') % relsrc)
 else:
 ui.warn(_('%s: cannot copy - %s\n') %
 return
 if ui.verbose or not exact:
 ui.status(_('copying %s to %s\n') % (relsrc, reltarget))
 targets[abstarget] = abssrc
 if abstarget != origsrc:
-if repo.dirstate.state(origsrc) == 'a':
+if repo.dirstate[origsrc] == 'a':
 if not ui.quiet:
 ui.warn(_("%s has not been committed yet, so no copy "
 "data will be stored for %s.\n")
 % (repo.pathto(origsrc, cwd), reltarget))
 if abstarget not in repo.dirstate and not opts.get('dry_run'):
-repo.add([abstarget], wlock)
+repo.add([abstarget])
 elif not opts.get('dry_run'):
-repo.copy(origsrc, abstarget, wlock)
+repo.copy(origsrc, abstarget)
 copied.append((abssrc, relsrc, exact))
 # pat: ossep
 # dest ossep
 # srcs: list of (hgsep, hgsep, ossep, bool)
 operation is recorded, but no copying is performed.
 This command takes effect in the next commit. To undo a copy
 before that, see hg revert.
 """
-wlock = repo.wlock(0)
+wlock = repo.wlock(False)
-errs, copied = docopy(ui, repo, pats, opts, wlock)
+try:
+errs, copied = docopy(ui, repo, pats, opts)
+finally:
+del wlock
 return errs
 def debugancestor(ui, index, rev1, rev2):
 """find the ancestor revision of two revisions in a given index"""
 r = revlog.revlog(util.opener(os.getcwd(), audit=False), index)
 if rev == "":
 rev = repo.changelog.tip()
 ctx = repo.changectx(rev)
 files = ctx.manifest()
 wlock = repo.wlock()
-repo.dirstate.rebuild(rev, files)
+try:
+repo.dirstate.rebuild(rev, files)
+finally:
+del wlock
 def debugcheckstate(ui, repo):
 """validate the correctness of the current dirstate"""
 parent1, parent2 = repo.dirstate.parents()
-dc = repo.dirstate
 m1 = repo.changectx(parent1).manifest()
 m2 = repo.changectx(parent2).manifest()
 errors = 0
-for f in dc:
+for f in repo.dirstate:
-state = repo.dirstate.state(f)
+state = repo.dirstate[f]
 if state in "nr" and f not in m1:
 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
 errors += 1
 if state in "a" and f in m1:
 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
 if state in "m" and f not in m1 and f not in m2:
 ui.warn(_("%s in state %s, but not in either manifest\n") %
 (f, state))
 errors += 1
 for f in m1:
-state = repo.dirstate.state(f)
+state = repo.dirstate[f]
 if state not in "nrm":
 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
 errors += 1
 if errors:
 error = _(".hg/dirstate inconsistent with current parent's manifest")
 wlock = repo.wlock()
 try:
 repo.dirstate.setparents(repo.lookup(rev1), repo.lookup(rev2))
 finally:
-wlock.release()
+del wlock
 def debugstate(ui, repo):
 """show the contents of the current dirstate"""
-dc = repo.dirstate
+dc = repo.dirstate._map
-for file_ in dc:
+k = dc.keys()
+k.sort()
+for file_ in k:
 if dc[file_][3] == -1:
 # Pad or slice to locale representation
 locale_len = len(time.strftime("%x %X", time.localtime(0)))
 timestr = 'unset'
 timestr = timestr[:locale_len] + ' '*(locale_len - len(timestr))
 def debuginstall(ui):
 '''test Mercurial installation'''
 def writetemp(contents):
-(fd, name) = tempfile.mkstemp()
+(fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
 f = os.fdopen(fd, "wb")
 f.write(contents)
 f.close()
 return name
 if opts.get('exact') or not opts['force']:
 cmdutil.bail_if_changed(repo)
 d = opts["base"]
 strip = opts["strip"]
+wlock = lock = None
-wlock = repo.wlock()
+try:
-lock = repo.lock()
+wlock = repo.wlock()
+lock = repo.lock()
 for p in patches:
 pf = os.path.join(d, p)
 if pf == '-':
 ui.status(_("applying patch from stdin\n"))
-tmpname, message, user, date, branch, nodeid, p1, p2 = patch.extract(ui, sys.stdin)
+data = patch.extract(ui, sys.stdin)
-else:
-ui.status(_("applying %s\n") % p)
-tmpname, message, user, date, branch, nodeid, p1, p2 = patch.extract(ui, file(pf, 'rb'))
-if tmpname is None:
-raise util.Abort(_('no diffs found'))
-try:
-cmdline_message = cmdutil.logmessage(opts)
-if cmdline_message:
-# pickup the cmdline msg
-message = cmdline_message
-elif message:
-# pickup the patch msg
-message = message.strip()
 else:
-# launch the editor
+ui.status(_("applying %s\n") % p)
-message = None
+data = patch.extract(ui, file(pf, 'rb'))
-ui.debug(_('message:\n%s\n') % message)
+tmpname, message, user, date, branch, nodeid, p1, p2 = data
-wp = repo.workingctx().parents()
-if opts.get('exact'):
+if tmpname is None:
-if not nodeid or not p1:
+raise util.Abort(_('no diffs found'))
-raise util.Abort(_('not a mercurial patch'))
-p1 = repo.lookup(p1)
+try:
-p2 = repo.lookup(p2 or hex(nullid))
+cmdline_message = cmdutil.logmessage(opts)
+if cmdline_message:
-if p1 != wp[0].node():
+# pickup the cmdline msg
-hg.clean(repo, p1, wlock=wlock)
+message = cmdline_message
-repo.dirstate.setparents(p1, p2)
+elif message:
-elif p2:
+# pickup the patch msg
+message = message.strip()
+else:
+# launch the editor
+message = None
+ui.debug(_('message:\n%s\n') % message)
+wp = repo.workingctx().parents()
+if opts.get('exact'):
+if not nodeid or not p1:
+raise util.Abort(_('not a mercurial patch'))
+p1 = repo.lookup(p1)
+p2 = repo.lookup(p2 or hex(nullid))
+if p1 != wp[0].node():
+hg.clean(repo, p1)
+repo.dirstate.setparents(p1, p2)
+elif p2:
+try:
+p1 = repo.lookup(p1)
+p2 = repo.lookup(p2)
+if p1 == wp[0].node():
+repo.dirstate.setparents(p1, p2)
+except hg.RepoError:
+pass
+if opts.get('exact') or opts.get('import_branch'):
+repo.dirstate.setbranch(branch or 'default')
+files = {}
 try:
-p1 = repo.lookup(p1)
+fuzz = patch.patch(tmpname, ui, strip=strip, cwd=repo.root,
-p2 = repo.lookup(p2)
+files=files)
-if p1 == wp[0].node():
+finally:
-repo.dirstate.setparents(p1, p2)
+files = patch.updatedir(ui, repo, files)
-except hg.RepoError:
+n = repo.commit(files, message, user, date)
-pass
+if opts.get('exact'):
-if opts.get('exact') or opts.get('import_branch'):
+if hex(n) != nodeid:
-repo.dirstate.setbranch(branch or 'default')
+repo.rollback()
+raise util.Abort(_('patch is damaged' +
-files = {}
+' or loses information'))
-try:
-fuzz = patch.patch(tmpname, ui, strip=strip, cwd=repo.root,
-files=files)
 finally:
-files = patch.updatedir(ui, repo, files, wlock=wlock)
+os.unlink(tmpname)
-n = repo.commit(files, message, user, date, wlock=wlock, lock=lock)
+finally:
-if opts.get('exact'):
+del lock, wlock
-if hex(n) != nodeid:
-repo.rollback(wlock=wlock, lock=lock)
-raise util.Abort(_('patch is damaged or loses information'))
-finally:
-os.unlink(tmpname)
 def incoming(ui, repo, source="default", **opts):
 """show new changesets found in source
 Show new changesets found in the specified path/URL or the default
 for src, abs, rel, exact in cmdutil.walk(repo, pats, opts, node=node,
 badmatch=util.always,
 default='relglob'):
 if src == 'b':
 continue
-if not node and repo.dirstate.state(abs) == '?':
+if not node and abs not in repo.dirstate:
 continue
 if opts['fullpath']:
 ui.write(os.path.join(repo.root, abs), end)
 else:
 ui.write(((pats and rel) or abs), end)
 To undo a remove before that, see hg revert.
 Modified files and added files are not removed by default.  To
 remove them, use the -f/--force option.
 """
-names = []
 if not opts['after'] and not pats:
 raise util.Abort(_('no files specified'))
 files, matchfn, anypats = cmdutil.matchpats(repo, pats, opts)
 exact = dict.fromkeys(files)
 mardu = map(dict.fromkeys, repo.status(files=files, match=matchfn))[:5]
 elif abs in added:
 if opts['force']:
 forget.append(abs)
 continue
 reason = _('has been marked for add (use -f to force removal)')
-elif repo.dirstate.state(abs) == '?':
+elif abs not in repo.dirstate:
 reason = _('is not managed')
 elif opts['after'] and not exact and abs not in deleted:
 continue
 elif abs in removed:
 continue
 operation is recorded, but no copying is performed.
 This command takes effect in the next commit. To undo a rename
 before that, see hg revert.
 """
-wlock = repo.wlock(0)
+wlock = repo.wlock(False)
-errs, copied = docopy(ui, repo, pats, opts, wlock)
+try:
-names = []
+errs, copied = docopy(ui, repo, pats, opts)
-for abs, rel, exact in copied:
+names = []
-if ui.verbose or not exact:
+for abs, rel, exact in copied:
-ui.status(_('removing %s\n') % rel)
+if ui.verbose or not exact:
-names.append(abs)
+ui.status(_('removing %s\n') % rel)
-if not opts.get('dry_run'):
+names.append(abs)
-repo.remove(names, True, wlock=wlock)
+if not opts.get('dry_run'):
-return errs
+repo.remove(names, True)
+return errs
+finally:
+del wlock
 def revert(ui, repo, *pats, **opts):
 """revert files or dirs to their states as of some revision
 With no revision specified, revert the named files or directories
 if node == parent:
 pmf = mf
 else:
 pmf = None
-wlock = repo.wlock()
 # need all matching names in dirstate and manifest of target rev,
 # so have to walk both. do not print errors if files exist in one
 # but not other.
 names = {}
 target_only = {}
-# walk dirstate.
+wlock = repo.wlock()
+try:
-for src, abs, rel, exact in cmdutil.walk(repo, pats, opts,
+# walk dirstate.
-badmatch=mf.has_key):
+for src, abs, rel, exact in cmdutil.walk(repo, pats, opts,
-names[abs] = (rel, exact)
+badmatch=mf.has_key):
-if src == 'b':
+names[abs] = (rel, exact)
+if src == 'b':
+target_only[abs] = True
+# walk target manifest.
+def badmatch(path):
+if path in names:
+return True
+path_ = path + '/'
+for f in names:
+if f.startswith(path_):
+return True
+return False
+for src, abs, rel, exact in cmdutil.walk(repo, pats, opts, node=node,
+badmatch=badmatch):
+if abs in names or src == 'b':
+continue
+names[abs] = (rel, exact)
 target_only[abs] = True
-# walk target manifest.
+changes = repo.status(match=names.has_key)[:5]
+modified, added, removed, deleted, unknown = map(dict.fromkeys, changes)
-def badmatch(path):
-if path in names:
+revert = ([], _('reverting %s\n'))
-return True
+add = ([], _('adding %s\n'))
-path_ = path + '/'
+remove = ([], _('removing %s\n'))
-for f in names:
+forget = ([], _('forgetting %s\n'))
-if f.startswith(path_):
+undelete = ([], _('undeleting %s\n'))
-return True
+update = {}
-return False
+disptable = (
-for src, abs, rel, exact in cmdutil.walk(repo, pats, opts, node=node,
+# dispatch table:
-badmatch=badmatch):
+#   file state
-if abs in names or src == 'b':
+#   action if in target manifest
-continue
+#   action if not in target manifest
-names[abs] = (rel, exact)
+#   make backup if in target manifest
-target_only[abs] = True
+#   make backup if not in target manifest
+(modified, revert, remove, True, True),
-changes = repo.status(match=names.has_key, wlock=wlock)[:5]
+(added, revert, forget, True, False),
-modified, added, removed, deleted, unknown = map(dict.fromkeys, changes)
+(removed, undelete, None, False, False),
+(deleted, revert, remove, False, False),
-revert = ([], _('reverting %s\n'))
+(unknown, add, None, True, False),
-add = ([], _('adding %s\n'))
+(target_only, add, None, False, False),
-remove = ([], _('removing %s\n'))
+)
-forget = ([], _('forgetting %s\n'))
-undelete = ([], _('undeleting %s\n'))
+entries = names.items()
-update = {}
+entries.sort()
-disptable = (
+for abs, (rel, exact) in entries:
-# dispatch table:
+mfentry = mf.get(abs)
-#   file state
+target = repo.wjoin(abs)
-#   action if in target manifest
+def handle(xlist, dobackup):
-#   action if not in target manifest
+xlist[0].append(abs)
-#   make backup if in target manifest
+update[abs] = 1
-#   make backup if not in target manifest
+if dobackup and not opts['no_backup'] and util.lexists(target):
-(modified, revert, remove, True, True),
+bakname = "%s.orig" % rel
-(added, revert, forget, True, False),
+ui.note(_('saving current version of %s as %s\n') %
-(removed, undelete, None, False, False),
+(rel, bakname))
-(deleted, revert, remove, False, False),
+if not opts.get('dry_run'):
-(unknown, add, None, True, False),
+util.copyfile(target, bakname)
-(target_only, add, None, False, False),
+if ui.verbose or not exact:
-)
+ui.status(xlist[1] % rel)
+for table, hitlist, misslist, backuphit, backupmiss in disptable:
-entries = names.items()
+if abs not in table: continue
-entries.sort()
+# file has changed in dirstate
+if mfentry:
-for abs, (rel, exact) in entries:
+handle(hitlist, backuphit)
-mfentry = mf.get(abs)
+elif misslist is not None:
-target = repo.wjoin(abs)
+handle(misslist, backupmiss)
-def handle(xlist, dobackup):
+else:
-xlist[0].append(abs)
+if exact: ui.warn(_('file not managed: %s\n') % rel)
-update[abs] = 1
+break
-if dobackup and not opts['no_backup'] and util.lexists(target):
-bakname = "%s.orig" % rel
-ui.note(_('saving current version of %s as %s\n') %
-(rel, bakname))
-if not opts.get('dry_run'):
-util.copyfile(target, bakname)
-if ui.verbose or not exact:
-ui.status(xlist[1] % rel)
-for table, hitlist, misslist, backuphit, backupmiss in disptable:
-if abs not in table: continue
-# file has changed in dirstate
-if mfentry:
-handle(hitlist, backuphit)
-elif misslist is not None:
-handle(misslist, backupmiss)
 else:
-if exact: ui.warn(_('file not managed: %s\n') % rel)
+# file has not changed in dirstate
-break
+if node == parent:
-else:
+if exact: ui.warn(_('no changes needed to %s\n') % rel)
-# file has not changed in dirstate
+continue
-if node == parent:
+if pmf is None:
-if exact: ui.warn(_('no changes needed to %s\n') % rel)
+# only need parent manifest in this unlikely case,
-continue
+# so do not read by default
-if pmf is None:
+pmf = repo.changectx(parent).manifest()
-# only need parent manifest in this unlikely case,
+if abs in pmf:
-# so do not read by default
+if mfentry:
-pmf = repo.changectx(parent).manifest()
+# if version of file is same in parent and target
-if abs in pmf:
+# manifests, do nothing
-if mfentry:
+if pmf[abs] != mfentry:
-# if version of file is same in parent and target
+handle(revert, False)
-# manifests, do nothing
+else:
-if pmf[abs] != mfentry:
+handle(remove, False)
-handle(revert, False)
-else:
+if not opts.get('dry_run'):
-handle(remove, False)
+for f in forget[0]:
+repo.dirstate.forget(f)
-if not opts.get('dry_run'):
+r = hg.revert(repo, node, update.has_key)
-repo.dirstate.forget(forget[0])
+for f in add[0]:
-r = hg.revert(repo, node, update.has_key, wlock)
+repo.dirstate.add(f)
-repo.dirstate.update(add[0], 'a')
+for f in undelete[0]:
-repo.dirstate.update(undelete[0], 'n')
+repo.dirstate.normal(f)
-repo.dirstate.update(remove[0], 'r')
+for f in remove[0]:
-return r
+repo.dirstate.remove(f)
+return r
+finally:
+del wlock
 def rollback(ui, repo):
 """roll back the last transaction in this repository
 Roll back the last transaction in this repository, restoring the
 s = sshserver.sshserver(ui, repo)
 s.serve_forever()
 parentui = ui.parentui or ui
 optlist = ("name templates style address port ipv6"
-" accesslog errorlog webdir_conf")
+" accesslog errorlog webdir_conf certificate")
 for o in optlist.split():
 if opts[o]:
 parentui.setconfig("web", o, str(opts[o]))
 if (repo is not None) and (repo.ui != parentui):
 repo.ui.setconfig("web", o, str(opts[o]))
 Apply one or more compressed changegroup files generated by the
 bundle command.
 """
 fnames = (fname1,) + fnames
-result = None
 for fname in fnames:
 if os.path.exists(fname):
 f = open(fname, "rb")
 else:
 f = urllib.urlopen(fname)
 commitopts = [
 ('m', 'message', '', _('use <text> as commit message')),
 ('l', 'logfile', '', _('read commit message from <file>')),
 ]
+commitopts2 = [
+('d', 'date', '', _('record datecode as commit date')),
+('u', 'user', '', _('record user as committer')),
+]
 table = {
 "^add": (add, walkopts + dryrunopts, _('hg add [OPTION]... [FILE]...')),
 "addremove":
 (addremove,
 [('s', 'similarity', '',
 ('a', 'text', None, _('treat all files as text')),
 ('u', 'user', None, _('list the author')),
 ('d', 'date', None, _('list the date')),
 ('n', 'number', None, _('list the revision number (default)')),
 ('c', 'changeset', None, _('list the changeset')),
+('l', 'line-number', None,
+_('show line number at the first appearance'))
 ] + walkopts,
-_('hg annotate [-r REV] [-f] [-a] [-u] [-d] [-n] [-c] FILE...')),
+_('hg annotate [-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...')),
 "archive":
 (archive,
 [('', 'no-decode', None, _('do not pass files through decoders')),
 ('p', 'prefix', '', _('directory prefix for files in archive')),
 ('r', 'rev', '', _('revision to distribute')),
 _('hg archive [OPTION]... DEST')),
 "backout":
 (backout,
 [('', 'merge', None,
 _('merge with old dirstate parent after backout')),
-('d', 'date', '', _('record datecode as commit date')),
 ('', 'parent', '', _('parent to choose when backing out merge')),
-('u', 'user', '', _('record user as committer')),
 ('r', 'rev', '', _('revision to backout')),
-] + walkopts + commitopts,
+] + walkopts + commitopts + commitopts2,
 _('hg backout [OPTION]... [-r] REV')),
 "branch":
 (branch,
 [('f', 'force', None,
 _('set branch name even if it shadows an existing branch'))],
 _('hg clone [OPTION]... SOURCE [DEST]')),
 "^commit|ci":
 (commit,
 [('A', 'addremove', None,
 _('mark new/missing files as added/removed before committing')),
-('d', 'date', '', _('record datecode as commit date')),
+] + walkopts + commitopts + commitopts2,
-('u', 'user', '', _('record user as commiter')),
-] + walkopts + commitopts,
 _('hg commit [OPTION]... [FILE]...')),
 "copy|cp":
 (copy,
 [('A', 'after', None, _('record a copy that has already occurred')),
 ('f', 'force', None,
 ] + remoteopts,
 _('hg push [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]')),
 "debugrawcommit|rawcommit":
 (rawcommit,
 [('p', 'parent', [], _('parent')),
-('d', 'date', '', _('date code')),
-('u', 'user', '', _('user')),
 ('F', 'files', '', _('file list'))
-] + commitopts,
+] + commitopts + commitopts2,
 _('hg debugrawcommit [OPTION]... [FILE]...')),
 "recover": (recover, [], _('hg recover')),
 "^remove|rm":
 (remove,
 [('A', 'after', None, _('record remove that has already occurred')),
 ' (serve more than one repo)')),
 ('', 'pid-file', '', _('name of file to write process ID to')),
 ('', 'stdio', None, _('for remote clients')),
 ('t', 'templates', '', _('web templates to use')),
 ('', 'style', '', _('template style to use')),
-('6', 'ipv6', None, _('use IPv6 in addition to IPv4'))],
+('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
+('', 'certificate', '', _('SSL certificate file'))],
 _('hg serve [OPTION]...')),
 "^status|st":
 (status,
 [('A', 'all', None, _('show status of all files')),
 ('m', 'modified', None, _('show only modified files')),
 _('hg status [OPTION]... [FILE]...')),
 "tag":
 (tag,
 [('f', 'force', None, _('replace existing tag')),
 ('l', 'local', None, _('make the tag local')),
-('m', 'message', '', _('message for tag commit log entry')),
-('d', 'date', '', _('record datecode as commit date')),
-('u', 'user', '', _('record user as commiter')),
 ('r', 'rev', '', _('revision to tag')),
-('', 'remove', None, _('remove a tag'))],
+('', 'remove', None, _('remove a tag')),
+# -l/--local is already there, commitopts cannot be used
+('m', 'message', '', _('use <text> as commit message')),
+] + commitopts2,
 _('hg tag [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME')),
 "tags": (tags, [], _('hg tags')),
 "tip":
 (tip,
 [('', 'style', '', _('display using template map file')),
 _('hg update [-C] [-d DATE] [[-r] REV]')),
 "verify": (verify, [], _('hg verify')),
 "version": (version_, [], _('hg version')),
 }
+extensions.commandtable = table
 norepo = ("clone init version help debugancestor debugcomplete debugdata"
 " debugindex debugindexdot debugdate debuginstall")
 optionalrepo = ("paths serve showconfig")
 def dispatch(args):

changeset 5124	06154aff2b1a
parent 5123	f94dbc6c7eaf
parent 5122	c80af96943aa
child 5138	13d23d66a6cd