mercurial-scm/hg-stable: hgext/githelp.py annotate

annotate hgext/githelp.py @ 35719:a4cd8f527a7f

githelp: clean up reflog help This referenced commands that don't exist in core. The new help isn't great since it references an experimental extension. But it is better than nothing. While we're here, also add test coverage. Differential Revision: https://phab.mercurial-scm.org/D1727

author	Gregory Szorc <gregory.szorc@gmail.com>
date	Mon, 18 Dec 2017 21:02:49 -0800
parents	a10a0d5561a9
children	b3cf58487731

rev	line source
35714 113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1 # githelp.py - Try to map Git commands to Mercurial equivalents.
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	2 #
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	3 # Copyright 2013 Facebook, Inc.
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	4 #
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	5 # This software may be used and distributed according to the terms of the
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	6 # GNU General Public License version 2 or any later version.
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	7 """try mapping git commands to Mercurial commands
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	8
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	9 Tries to map a given git command to a Mercurial command:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	10
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	11 $ hg githelp -- git checkout master
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	12 hg update master
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	13
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	14 If an unknown command or parameter combination is detected, an error is
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	15 produced.
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	16 """
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	17
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	18 from __future__ import absolute_import
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	19
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	20 import getopt
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	21 import re
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	22
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	23 from mercurial.i18n import _
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	24 from mercurial import (
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	25 error,
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	26 fancyopts,
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	27 registrar,
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	28 util,
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	29 )
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	30
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	31 # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	32 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	33 # be specifying the version(s) of Mercurial they are tested with, or
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	34 # leave the attribute unspecified.
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	35 testedwith = 'ships-with-hg-core'
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	36
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	37 cmdtable = {}
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	38 command = registrar.command(cmdtable)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	39
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	40 def convert(s):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	41 if s.startswith("origin/"):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	42 return s[7:]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	43 if 'HEAD' in s:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	44 s = s.replace('HEAD', '.')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	45 # HEAD~ in git is .~1 in mercurial
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	46 s = re.sub('~$', '~1', s)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	47 return s
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	48
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	49 @command('^githelp\|git', [
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	50 ], _('hg githelp'))
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	51 def githelp(ui, repo, args, *kwargs):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	52 '''suggests the Mercurial equivalent of the given git command
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	53
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	54 Usage: hg githelp -- <git command>
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	55 '''
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	56
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	57 if len(args) == 0 or (len(args) == 1 and args[0] =='git'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	58 raise error.Abort(_('missing git command - '
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	59 'usage: hg githelp -- <git command>'))
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	60
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	61 if args[0] == 'git':
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	62 args = args[1:]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	63
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	64 cmd = args[0]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	65 if not cmd in gitcommands:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	66 raise error.Abort("error: unknown git command %s" % (cmd))
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	67
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	68 ui.pager('githelp')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	69 args = args[1:]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	70 return gitcommands[cmd](ui, repo, args, *kwargs)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	71
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	72 def parseoptions(ui, cmdoptions, args):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	73 cmdoptions = list(cmdoptions)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	74 opts = {}
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	75 args = list(args)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	76 while True:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	77 try:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	78 args = fancyopts.fancyopts(list(args), cmdoptions, opts, True)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	79 break
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	80 except getopt.GetoptError as ex:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	81 flag = None
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	82 if "requires argument" in ex.msg:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	83 raise
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	84 if ('--' + ex.opt) in ex.msg:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	85 flag = '--' + ex.opt
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	86 elif ('-' + ex.opt) in ex.msg:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	87 flag = '-' + ex.opt
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	88 else:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	89 raise error.Abort("unknown option %s" % ex.opt)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	90 try:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	91 args.remove(flag)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	92 except Exception:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	93 raise error.Abort(
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	94 "unknown option {0} packed with other options\n"
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	95 "Please try passing the option as it's own flag: -{0}" \
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	96 .format(ex.opt))
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	97
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	98 ui.warn(_("ignoring unknown option %s\n") % flag)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	99
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	100 args = list([convert(x) for x in args])
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	101 opts = dict([(k, convert(v)) if isinstance(v, str) else (k, v)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	102 for k, v in opts.iteritems()])
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	103
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	104 return args, opts
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	105
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	106 class Command(object):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	107 def __init__(self, name):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	108 self.name = name
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	109 self.args = []
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	110 self.opts = {}
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	111
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	112 def __str__(self):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	113 cmd = "hg " + self.name
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	114 if self.opts:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	115 for k, values in sorted(self.opts.iteritems()):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	116 for v in values:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	117 if v:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	118 cmd += " %s %s" % (k, v)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	119 else:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	120 cmd += " %s" % (k,)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	121 if self.args:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	122 cmd += " "
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	123 cmd += " ".join(self.args)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	124 return cmd
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	125
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	126 def append(self, value):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	127 self.args.append(value)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	128
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	129 def extend(self, values):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	130 self.args.extend(values)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	131
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	132 def __setitem__(self, key, value):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	133 values = self.opts.setdefault(key, [])
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	134 values.append(value)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	135
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	136 def __and__(self, other):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	137 return AndCommand(self, other)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	138
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	139 class AndCommand(object):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	140 def __init__(self, left, right):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	141 self.left = left
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	142 self.right = right
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	143
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	144 def __str__(self):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	145 return "%s && %s" % (self.left, self.right)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	146
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	147 def __and__(self, other):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	148 return AndCommand(self, other)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	149
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	150 def add(ui, repo, args, *kwargs):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	151 cmdoptions = [
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	152 ('A', 'all', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	153 ('p', 'patch', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	154 ]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	155 args, opts = parseoptions(ui, cmdoptions, args)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	156
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	157 if (opts.get('patch')):
35715 8dbd000f7de9 githelp: improve help for `git add` Gregory Szorc <gregory.szorc@gmail.com> parents: 35714 diff changeset	158 ui.status(_("note: Mercurial will commit when complete, "
8dbd000f7de9 githelp: improve help for `git add` Gregory Szorc <gregory.szorc@gmail.com> parents: 35714 diff changeset	159 "as there is no staging area in Mercurial\n\n"))
8dbd000f7de9 githelp: improve help for `git add` Gregory Szorc <gregory.szorc@gmail.com> parents: 35714 diff changeset	160 cmd = Command('commit --interactive')
35714 113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	161 else:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	162 cmd = Command("add")
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	163
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	164 if not opts.get('all'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	165 cmd.extend(args)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	166 else:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	167 ui.status(_("note: use hg addremove to remove files that have "
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	168 "been deleted.\n\n"))
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	169
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	170 ui.status((str(cmd)), "\n")
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	171
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	172 def am(ui, repo, args, *kwargs):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	173 cmdoptions=[
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	174 ]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	175 args, opts = parseoptions(ui, cmdoptions, args)
35716 05b8adf38c55 githelp: recommend `hg import` for `git am` Gregory Szorc <gregory.szorc@gmail.com> parents: 35715 diff changeset	176 cmd = Command('import')
05b8adf38c55 githelp: recommend `hg import` for `git am` Gregory Szorc <gregory.szorc@gmail.com> parents: 35715 diff changeset	177 ui.status(str(cmd), "\n")
35714 113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	178
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	179 def apply(ui, repo, args, *kwargs):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	180 cmdoptions = [
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	181 ('p', 'p', int, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	182 ]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	183 args, opts = parseoptions(ui, cmdoptions, args)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	184
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	185 cmd = Command('import --no-commit')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	186 if (opts.get('p')):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	187 cmd['-p'] = opts.get('p')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	188 cmd.extend(args)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	189
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	190 ui.status((str(cmd)), "\n")
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	191
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	192 def bisect(ui, repo, args, *kwargs):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	193 ui.status(_("See 'hg help bisect' for how to use bisect.\n\n"))
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	194
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	195 def blame(ui, repo, args, *kwargs):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	196 cmdoptions = [
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	197 ]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	198 args, opts = parseoptions(ui, cmdoptions, args)
35717 5edfead8cc95 githelp: remove reference to tweakdefaults Gregory Szorc <gregory.szorc@gmail.com> parents: 35716 diff changeset	199 cmd = Command('annotate -udl')
35714 113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	200 cmd.extend([convert(v) for v in args])
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	201 ui.status((str(cmd)), "\n")
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	202
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	203 def branch(ui, repo, args, *kwargs):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	204 cmdoptions = [
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	205 ('', 'set-upstream', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	206 ('', 'set-upstream-to', '', ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	207 ('d', 'delete', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	208 ('D', 'delete', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	209 ('m', 'move', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	210 ('M', 'move', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	211 ]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	212 args, opts = parseoptions(ui, cmdoptions, args)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	213
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	214 cmd = Command("bookmark")
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	215
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	216 if opts.get('set_upstream') or opts.get('set_upstream_to'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	217 ui.status(_("Mercurial has no concept of upstream branches\n"))
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	218 return
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	219 elif opts.get('delete'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	220 cmd = Command("strip")
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	221 for branch in args:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	222 cmd['-B'] = branch
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	223 else:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	224 cmd['-B'] = None
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	225 elif opts.get('move'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	226 if len(args) > 0:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	227 if len(args) > 1:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	228 old = args.pop(0)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	229 else:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	230 # shell command to output the active bookmark for the active
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	231 # revision
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	232 old = '`hg log -T"{activebookmark}" -r .`'
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	233 new = args[0]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	234 cmd['-m'] = old
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	235 cmd.append(new)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	236 else:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	237 if len(args) > 1:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	238 cmd['-r'] = args[1]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	239 cmd.append(args[0])
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	240 elif len(args) == 1:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	241 cmd.append(args[0])
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	242 ui.status((str(cmd)), "\n")
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	243
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	244 def ispath(repo, string):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	245 """
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	246 The first argument to git checkout can either be a revision or a path. Let's
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	247 generally assume it's a revision, unless it's obviously a path. There are
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	248 too many ways to spell revisions in git for us to reasonably catch all of
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	249 them, so let's be conservative.
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	250 """
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	251 if string in repo:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	252 # if it's definitely a revision let's not even check if a file of the
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	253 # same name exists.
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	254 return False
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	255
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	256 cwd = repo.getcwd()
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	257 if cwd == '':
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	258 repopath = string
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	259 else:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	260 repopath = cwd + '/' + string
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	261
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	262 exists = repo.wvfs.exists(repopath)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	263 if exists:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	264 return True
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	265
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	266 manifest = repo['.'].manifest()
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	267
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	268 didexist = (repopath in manifest) or manifest.hasdir(repopath)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	269
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	270 return didexist
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	271
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	272 def checkout(ui, repo, args, *kwargs):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	273 cmdoptions = [
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	274 ('b', 'branch', '', ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	275 ('B', 'branch', '', ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	276 ('f', 'force', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	277 ('p', 'patch', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	278 ]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	279 paths = []
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	280 if '--' in args:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	281 sepindex = args.index('--')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	282 paths.extend(args[sepindex + 1:])
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	283 args = args[:sepindex]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	284
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	285 args, opts = parseoptions(ui, cmdoptions, args)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	286
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	287 rev = None
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	288 if args and ispath(repo, args[0]):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	289 paths = args + paths
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	290 elif args:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	291 rev = args[0]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	292 paths = args[1:] + paths
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	293
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	294 cmd = Command('update')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	295
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	296 if opts.get('force'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	297 if paths or rev:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	298 cmd['-C'] = None
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	299
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	300 if opts.get('patch'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	301 cmd = Command('revert')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	302 cmd['-i'] = None
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	303
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	304 if opts.get('branch'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	305 if len(args) == 0:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	306 cmd = Command('bookmark')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	307 cmd.append(opts.get('branch'))
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	308 else:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	309 cmd.append(args[0])
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	310 bookcmd = Command('bookmark')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	311 bookcmd.append(opts.get('branch'))
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	312 cmd = cmd & bookcmd
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	313 # if there is any path argument supplied, use revert instead of update
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	314 elif len(paths) > 0:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	315 ui.status(_("note: use --no-backup to avoid creating .orig files\n\n"))
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	316 cmd = Command('revert')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	317 if opts.get('patch'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	318 cmd['-i'] = None
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	319 if rev:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	320 cmd['-r'] = rev
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	321 cmd.extend(paths)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	322 elif rev:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	323 if opts.get('patch'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	324 cmd['-r'] = rev
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	325 else:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	326 cmd.append(rev)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	327 elif opts.get('force'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	328 cmd = Command('revert')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	329 cmd['--all'] = None
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	330 else:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	331 raise error.Abort("a commit must be specified")
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	332
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	333 ui.status((str(cmd)), "\n")
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	334
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	335 def cherrypick(ui, repo, args, *kwargs):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	336 cmdoptions = [
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	337 ('', 'continue', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	338 ('', 'abort', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	339 ('e', 'edit', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	340 ]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	341 args, opts = parseoptions(ui, cmdoptions, args)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	342
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	343 cmd = Command('graft')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	344
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	345 if opts.get('edit'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	346 cmd['--edit'] = None
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	347 if opts.get('continue'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	348 cmd['--continue'] = None
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	349 elif opts.get('abort'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	350 ui.status(_("note: hg graft does not have --abort.\n\n"))
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	351 return
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	352 else:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	353 cmd.extend(args)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	354
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	355 ui.status((str(cmd)), "\n")
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	356
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	357 def clean(ui, repo, args, *kwargs):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	358 cmdoptions = [
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	359 ('d', 'd', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	360 ('f', 'force', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	361 ('x', 'x', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	362 ]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	363 args, opts = parseoptions(ui, cmdoptions, args)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	364
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	365 cmd = Command('purge')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	366 if opts.get('x'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	367 cmd['--all'] = None
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	368 cmd.extend(args)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	369
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	370 ui.status((str(cmd)), "\n")
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	371
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	372 def clone(ui, repo, args, *kwargs):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	373 cmdoptions = [
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	374 ('', 'bare', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	375 ('n', 'no-checkout', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	376 ('b', 'branch', '', ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	377 ]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	378 args, opts = parseoptions(ui, cmdoptions, args)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	379
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	380 if len(args) == 0:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	381 raise error.Abort("a repository to clone must be specified")
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	382
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	383 cmd = Command('clone')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	384 cmd.append(args[0])
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	385 if len(args) > 1:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	386 cmd.append(args[1])
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	387
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	388 if opts.get('bare'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	389 cmd['-U'] = None
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	390 ui.status(_("note: Mercurial does not have bare clones. " +
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	391 "-U will clone the repo without checking out a commit\n\n"))
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	392 elif opts.get('no_checkout'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	393 cmd['-U'] = None
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	394
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	395 if opts.get('branch'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	396 cocmd = Command("update")
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	397 cocmd.append(opts.get('branch'))
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	398 cmd = cmd & cocmd
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	399
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	400 ui.status((str(cmd)), "\n")
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	401
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	402 def commit(ui, repo, args, *kwargs):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	403 cmdoptions = [
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	404 ('a', 'all', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	405 ('m', 'message', '', ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	406 ('p', 'patch', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	407 ('C', 'reuse-message', '', ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	408 ('F', 'file', '', ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	409 ('', 'author', '', ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	410 ('', 'date', '', ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	411 ('', 'amend', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	412 ('', 'no-edit', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	413 ]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	414 args, opts = parseoptions(ui, cmdoptions, args)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	415
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	416 cmd = Command('commit')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	417 if opts.get('patch'):
35718 a10a0d5561a9 githelp: replace suggestion of `hg record` Gregory Szorc <gregory.szorc@gmail.com> parents: 35717 diff changeset	418 cmd = Command('commit --interactive')
35714 113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	419
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	420 if opts.get('amend'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	421 if opts.get('no_edit'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	422 cmd = Command('amend')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	423 else:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	424 cmd['--amend'] = None
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	425
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	426 if opts.get('reuse_message'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	427 cmd['-M'] = opts.get('reuse_message')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	428
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	429 if opts.get('message'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	430 cmd['-m'] = "'%s'" % (opts.get('message'),)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	431
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	432 if opts.get('all'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	433 ui.status(_("note: Mercurial doesn't have a staging area, " +
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	434 "so there is no --all. -A will add and remove files " +
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	435 "for you though.\n\n"))
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	436
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	437 if opts.get('file'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	438 cmd['-l'] = opts.get('file')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	439
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	440 if opts.get('author'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	441 cmd['-u'] = opts.get('author')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	442
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	443 if opts.get('date'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	444 cmd['-d'] = opts.get('date')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	445
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	446 cmd.extend(args)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	447
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	448 ui.status((str(cmd)), "\n")
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	449
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	450 def deprecated(ui, repo, args, *kwargs):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	451 ui.warn(_('This command has been deprecated in the git project, ' +
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	452 'thus isn\'t supported by this tool.\n\n'))
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	453
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	454 def diff(ui, repo, args, *kwargs):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	455 cmdoptions = [
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	456 ('a', 'all', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	457 ('', 'cached', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	458 ('R', 'reverse', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	459 ]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	460 args, opts = parseoptions(ui, cmdoptions, args)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	461
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	462 cmd = Command('diff')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	463
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	464 if opts.get('cached'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	465 ui.status(_('note: Mercurial has no concept of a staging area, ' +
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	466 'so --cached does nothing.\n\n'))
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	467
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	468 if opts.get('reverse'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	469 cmd['--reverse'] = None
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	470
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	471 for a in list(args):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	472 args.remove(a)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	473 try:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	474 repo.revs(a)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	475 cmd['-r'] = a
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	476 except Exception:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	477 cmd.append(a)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	478
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	479 ui.status((str(cmd)), "\n")
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	480
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	481 def difftool(ui, repo, args, *kwargs):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	482 ui.status(_('Mercurial does not enable external difftool by default. You '
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	483 'need to enable the extdiff extension in your .hgrc file by adding\n'
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	484 'extdiff =\n'
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	485 'to the [extensions] section and then running\n\n'
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	486 'hg extdiff -p <program>\n\n'
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	487 'See \'hg help extdiff\' and \'hg help -e extdiff\' for more '
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	488 'information.\n'))
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	489
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	490 def fetch(ui, repo, args, *kwargs):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	491 cmdoptions = [
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	492 ('', 'all', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	493 ('f', 'force', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	494 ]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	495 args, opts = parseoptions(ui, cmdoptions, args)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	496
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	497 cmd = Command('pull')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	498
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	499 if len(args) > 0:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	500 cmd.append(args[0])
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	501 if len(args) > 1:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	502 ui.status(_("note: Mercurial doesn't have refspecs. " +
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	503 "-r can be used to specify which commits you want to pull. " +
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	504 "-B can be used to specify which bookmark you want to pull." +
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	505 "\n\n"))
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	506 for v in args[1:]:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	507 if v in repo._bookmarks:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	508 cmd['-B'] = v
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	509 else:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	510 cmd['-r'] = v
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	511
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	512 ui.status((str(cmd)), "\n")
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	513
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	514 def grep(ui, repo, args, *kwargs):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	515 cmdoptions = [
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	516 ]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	517 args, opts = parseoptions(ui, cmdoptions, args)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	518
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	519 cmd = Command('grep')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	520
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	521 # For basic usage, git grep and hg grep are the same. They both have the
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	522 # pattern first, followed by paths.
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	523 cmd.extend(args)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	524
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	525 ui.status((str(cmd)), "\n")
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	526
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	527 def init(ui, repo, args, *kwargs):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	528 cmdoptions = [
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	529 ]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	530 args, opts = parseoptions(ui, cmdoptions, args)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	531
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	532 cmd = Command('init')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	533
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	534 if len(args) > 0:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	535 cmd.append(args[0])
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	536
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	537 ui.status((str(cmd)), "\n")
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	538
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	539 def log(ui, repo, args, *kwargs):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	540 cmdoptions = [
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	541 ('', 'follow', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	542 ('', 'decorate', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	543 ('n', 'number', '', ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	544 ('1', '1', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	545 ('', 'pretty', '', ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	546 ('', 'format', '', ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	547 ('', 'oneline', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	548 ('', 'stat', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	549 ('', 'graph', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	550 ('p', 'patch', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	551 ]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	552 args, opts = parseoptions(ui, cmdoptions, args)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	553 ui.status(_('note: -v prints the entire commit message like Git does. To ' +
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	554 'print just the first line, drop the -v.\n\n'))
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	555 ui.status(_("note: see hg help revset for information on how to filter " +
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	556 "log output.\n\n"))
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	557
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	558 cmd = Command('log')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	559 cmd['-v'] = None
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	560
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	561 if opts.get('number'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	562 cmd['-l'] = opts.get('number')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	563 if opts.get('1'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	564 cmd['-l'] = '1'
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	565 if opts.get('stat'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	566 cmd['--stat'] = None
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	567 if opts.get('graph'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	568 cmd['-G'] = None
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	569 if opts.get('patch'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	570 cmd['-p'] = None
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	571
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	572 if opts.get('pretty') or opts.get('format') or opts.get('oneline'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	573 format = opts.get('format', '')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	574 if 'format:' in format:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	575 ui.status(_("note: --format format:??? equates to Mercurial's " +
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	576 "--template. See hg help templates for more info.\n\n"))
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	577 cmd['--template'] = '???'
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	578 else:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	579 ui.status(_("note: --pretty/format/oneline equate to Mercurial's " +
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	580 "--style or --template. See hg help templates for more info." +
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	581 "\n\n"))
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	582 cmd['--style'] = '???'
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	583
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	584 if len(args) > 0:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	585 if '..' in args[0]:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	586 since, until = args[0].split('..')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	587 cmd['-r'] = "'%s::%s'" % (since, until)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	588 del args[0]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	589 cmd.extend(args)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	590
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	591 ui.status((str(cmd)), "\n")
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	592
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	593 def lsfiles(ui, repo, args, *kwargs):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	594 cmdoptions = [
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	595 ('c', 'cached', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	596 ('d', 'deleted', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	597 ('m', 'modified', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	598 ('o', 'others', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	599 ('i', 'ignored', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	600 ('s', 'stage', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	601 ('z', '_zero', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	602 ]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	603 args, opts = parseoptions(ui, cmdoptions, args)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	604
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	605 if (opts.get('modified') or opts.get('deleted')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	606 or opts.get('others') or opts.get('ignored')):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	607 cmd = Command('status')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	608 if opts.get('deleted'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	609 cmd['-d'] = None
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	610 if opts.get('modified'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	611 cmd['-m'] = None
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	612 if opts.get('others'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	613 cmd['-o'] = None
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	614 if opts.get('ignored'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	615 cmd['-i'] = None
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	616 else:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	617 cmd = Command('files')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	618 if opts.get('stage'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	619 ui.status(_("note: Mercurial doesn't have a staging area, ignoring "
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	620 "--stage\n"))
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	621 if opts.get('_zero'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	622 cmd['-0'] = None
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	623 cmd.append('.')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	624 for include in args:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	625 cmd['-I'] = util.shellquote(include)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	626
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	627 ui.status((str(cmd)), "\n")
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	628
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	629 def merge(ui, repo, args, *kwargs):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	630 cmdoptions = [
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	631 ]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	632 args, opts = parseoptions(ui, cmdoptions, args)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	633
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	634 cmd = Command('merge')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	635
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	636 if len(args) > 0:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	637 cmd.append(args[len(args) - 1])
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	638
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	639 ui.status((str(cmd)), "\n")
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	640
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	641 def mergebase(ui, repo, args, *kwargs):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	642 cmdoptions = []
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	643 args, opts = parseoptions(ui, cmdoptions, args)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	644
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	645 if len(args) != 2:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	646 args = ['A', 'B']
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	647
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	648 cmd = Command("log -T '{node}\\n' -r 'ancestor(%s,%s)'"
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	649 % (args[0], args[1]))
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	650
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	651 ui.status(_('NOTE: ancestors() is part of the revset language.\n'),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	652 _("Learn more about revsets with 'hg help revsets'\n\n"))
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	653 ui.status((str(cmd)), "\n")
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	654
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	655 def mergetool(ui, repo, args, *kwargs):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	656 cmdoptions = []
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	657 args, opts = parseoptions(ui, cmdoptions, args)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	658
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	659 cmd = Command("resolve")
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	660
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	661 if len(args) == 0:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	662 cmd['--all'] = None
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	663 cmd.extend(args)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	664 ui.status((str(cmd)), "\n")
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	665
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	666 def mv(ui, repo, args, *kwargs):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	667 cmdoptions = [
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	668 ('f', 'force', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	669 ]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	670 args, opts = parseoptions(ui, cmdoptions, args)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	671
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	672 cmd = Command('mv')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	673 cmd.extend(args)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	674
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	675 if opts.get('force'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	676 cmd['-f'] = None
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	677
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	678 ui.status((str(cmd)), "\n")
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	679
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	680 def pull(ui, repo, args, *kwargs):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	681 cmdoptions = [
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	682 ('', 'all', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	683 ('f', 'force', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	684 ('r', 'rebase', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	685 ]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	686 args, opts = parseoptions(ui, cmdoptions, args)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	687
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	688 cmd = Command('pull')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	689 cmd['--rebase'] = None
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	690
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	691 if len(args) > 0:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	692 cmd.append(args[0])
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	693 if len(args) > 1:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	694 ui.status(_("note: Mercurial doesn't have refspecs. " +
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	695 "-r can be used to specify which commits you want to pull. " +
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	696 "-B can be used to specify which bookmark you want to pull." +
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	697 "\n\n"))
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	698 for v in args[1:]:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	699 if v in repo._bookmarks:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	700 cmd['-B'] = v
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	701 else:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	702 cmd['-r'] = v
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	703
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	704 ui.status((str(cmd)), "\n")
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	705
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	706 def push(ui, repo, args, *kwargs):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	707 cmdoptions = [
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	708 ('', 'all', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	709 ('f', 'force', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	710 ]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	711 args, opts = parseoptions(ui, cmdoptions, args)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	712
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	713 cmd = Command('push')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	714
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	715 if len(args) > 0:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	716 cmd.append(args[0])
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	717 if len(args) > 1:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	718 ui.status(_("note: Mercurial doesn't have refspecs. " +
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	719 "-r can be used to specify which commits you want to push. " +
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	720 "-B can be used to specify which bookmark you want to push." +
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	721 "\n\n"))
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	722 for v in args[1:]:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	723 if v in repo._bookmarks:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	724 cmd['-B'] = v
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	725 else:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	726 cmd['-r'] = v
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	727
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	728 if opts.get('force'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	729 cmd['-f'] = None
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	730
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	731 ui.status((str(cmd)), "\n")
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	732
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	733 def rebase(ui, repo, args, *kwargs):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	734 cmdoptions = [
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	735 ('', 'all', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	736 ('i', 'interactive', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	737 ('', 'onto', '', ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	738 ('', 'abort', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	739 ('', 'continue', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	740 ('', 'skip', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	741 ]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	742 args, opts = parseoptions(ui, cmdoptions, args)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	743
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	744 if opts.get('interactive'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	745 ui.status(_("note: hg histedit does not perform a rebase. " +
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	746 "It just edits history.\n\n"))
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	747 cmd = Command('histedit')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	748 if len(args) > 0:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	749 ui.status(_("also note: 'hg histedit' will automatically detect"
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	750 " your stack, so no second argument is necessary.\n\n"))
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	751 ui.status((str(cmd)), "\n")
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	752 return
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	753
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	754 if opts.get('skip'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	755 cmd = Command('revert --all -r .')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	756 ui.status((str(cmd)), "\n")
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	757
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	758 cmd = Command('rebase')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	759
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	760 if opts.get('continue') or opts.get('skip'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	761 cmd['--continue'] = None
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	762 if opts.get('abort'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	763 cmd['--abort'] = None
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	764
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	765 if opts.get('onto'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	766 ui.status(_("note: if you're trying to lift a commit off one branch, " +
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	767 "try hg rebase -d <destination commit> -s <commit to be lifted>" +
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	768 "\n\n"))
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	769 cmd['-d'] = convert(opts.get('onto'))
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	770 if len(args) < 2:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	771 raise error.Abort("Expected format: git rebase --onto X Y Z")
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	772 cmd['-s'] = "'::%s - ::%s'" % (convert(args[1]), convert(args[0]))
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	773 else:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	774 if len(args) == 1:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	775 cmd['-d'] = convert(args[0])
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	776 elif len(args) == 2:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	777 cmd['-d'] = convert(args[0])
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	778 cmd['-b'] = convert(args[1])
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	779
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	780 ui.status((str(cmd)), "\n")
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	781
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	782 def reflog(ui, repo, args, *kwargs):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	783 cmdoptions = [
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	784 ('', 'all', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	785 ]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	786 args, opts = parseoptions(ui, cmdoptions, args)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	787
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	788 cmd = Command('journal')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	789 if opts.get('all'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	790 cmd['--all'] = None
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	791 if len(args) > 0:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	792 cmd.append(args[0])
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	793
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	794 ui.status(str(cmd), "\n\n")
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	795 ui.status(_("note: in hg commits can be deleted from repo but we always"
35719 a4cd8f527a7f githelp: clean up reflog help Gregory Szorc <gregory.szorc@gmail.com> parents: 35718 diff changeset	796 " have backups.\n"))
35714 113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	797
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	798 def reset(ui, repo, args, *kwargs):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	799 cmdoptions = [
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	800 ('', 'soft', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	801 ('', 'hard', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	802 ('', 'mixed', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	803 ]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	804 args, opts = parseoptions(ui, cmdoptions, args)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	805
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	806 commit = convert(args[0] if len(args) > 0 else '.')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	807 hard = opts.get('hard')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	808
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	809 if opts.get('mixed'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	810 ui.status(_('NOTE: --mixed has no meaning since mercurial has no ' +
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	811 'staging area\n\n'))
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	812
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	813 cmd = Command('reset')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	814 if hard:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	815 cmd.append('--clean')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	816 cmd.append(commit)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	817
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	818 ui.status((str(cmd)), "\n")
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	819
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	820 def revert(ui, repo, args, *kwargs):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	821 cmdoptions = [
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	822 ]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	823 args, opts = parseoptions(ui, cmdoptions, args)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	824
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	825 if len(args) > 1:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	826 ui.status(_("note: hg backout doesn't support multiple commits at " +
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	827 "once\n\n"))
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	828
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	829 cmd = Command('backout')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	830 if args:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	831 cmd.append(args[0])
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	832
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	833 ui.status((str(cmd)), "\n")
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	834
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	835 def revparse(ui, repo, args, *kwargs):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	836 cmdoptions = [
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	837 ('', 'show-cdup', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	838 ('', 'show-toplevel', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	839 ]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	840 args, opts = parseoptions(ui, cmdoptions, args)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	841
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	842 if opts.get('show_cdup') or opts.get('show_toplevel'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	843 cmd = Command('root')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	844 if opts.get('show_cdup'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	845 ui.status(_("note: hg root prints the root of the repository\n\n"))
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	846 ui.status((str(cmd)), "\n")
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	847 else:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	848 ui.status(_("note: see hg help revset for how to refer to commits\n"))
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	849
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	850 def rm(ui, repo, args, *kwargs):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	851 cmdoptions = [
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	852 ('f', 'force', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	853 ('n', 'dry-run', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	854 ]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	855 args, opts = parseoptions(ui, cmdoptions, args)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	856
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	857 cmd = Command('rm')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	858 cmd.extend(args)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	859
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	860 if opts.get('force'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	861 cmd['-f'] = None
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	862 if opts.get('dry_run'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	863 cmd['-n'] = None
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	864
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	865 ui.status((str(cmd)), "\n")
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	866
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	867 def show(ui, repo, args, *kwargs):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	868 cmdoptions = [
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	869 ('', 'name-status', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	870 ('', 'pretty', '', ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	871 ('U', 'unified', int, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	872 ]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	873 args, opts = parseoptions(ui, cmdoptions, args)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	874
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	875 cmd = Command('show')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	876 if opts.get('name_status'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	877 if opts.get('pretty') == 'format:':
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	878 cmd = Command('stat')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	879 cmd['--change'] = 'tip'
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	880 else:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	881 cmd = Command('log')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	882 cmd.append('--style status')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	883 cmd.append('-r tip')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	884 elif len(args) > 0:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	885 if ispath(repo, args[0]):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	886 cmd.append('.')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	887 cmd.extend(args)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	888 if opts.get('unified'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	889 cmd.append('--config diff.unified=%d' % (opts['unified'],))
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	890 elif opts.get('unified'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	891 cmd.append('--config diff.unified=%d' % (opts['unified'],))
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	892
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	893 ui.status((str(cmd)), "\n")
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	894
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	895 def stash(ui, repo, args, *kwargs):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	896 cmdoptions = [
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	897 ]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	898 args, opts = parseoptions(ui, cmdoptions, args)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	899
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	900 cmd = Command('shelve')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	901 action = args[0] if len(args) > 0 else None
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	902
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	903 if action == 'list':
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	904 cmd['-l'] = None
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	905 elif action == 'drop':
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	906 cmd['-d'] = None
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	907 if len(args) > 1:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	908 cmd.append(args[1])
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	909 else:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	910 cmd.append('<shelve name>')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	911 elif action == 'pop' or action == 'apply':
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	912 cmd = Command('unshelve')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	913 if len(args) > 1:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	914 cmd.append(args[1])
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	915 if action == 'apply':
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	916 cmd['--keep'] = None
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	917 elif (action == 'branch' or action == 'show' or action == 'clear'
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	918 or action == 'create'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	919 ui.status(_("note: Mercurial doesn't have equivalents to the " +
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	920 "git stash branch, show, clear, or create actions.\n\n"))
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	921 return
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	922 else:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	923 if len(args) > 0:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	924 if args[0] != 'save':
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	925 cmd['--name'] = args[0]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	926 elif len(args) > 1:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	927 cmd['--name'] = args[1]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	928
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	929 ui.status((str(cmd)), "\n")
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	930
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	931 def status(ui, repo, args, *kwargs):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	932 cmdoptions = [
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	933 ('', 'ignored', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	934 ]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	935 args, opts = parseoptions(ui, cmdoptions, args)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	936
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	937 cmd = Command('status')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	938 cmd.extend(args)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	939
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	940 if opts.get('ignored'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	941 cmd['-i'] = None
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	942
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	943 ui.status((str(cmd)), "\n")
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	944
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	945 def svn(ui, repo, args, *kwargs):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	946 svncmd = args[0]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	947 if not svncmd in gitsvncommands:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	948 ui.warn(_("error: unknown git svn command %s\n") % (svncmd))
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	949
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	950 args = args[1:]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	951 return gitsvncommands[svncmd](ui, repo, args, *kwargs)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	952
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	953 def svndcommit(ui, repo, args, *kwargs):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	954 cmdoptions = [
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	955 ]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	956 args, opts = parseoptions(ui, cmdoptions, args)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	957
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	958 cmd = Command('push')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	959
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	960 ui.status((str(cmd)), "\n")
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	961
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	962 def svnfetch(ui, repo, args, *kwargs):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	963 cmdoptions = [
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	964 ]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	965 args, opts = parseoptions(ui, cmdoptions, args)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	966
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	967 cmd = Command('pull')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	968 cmd.append('default-push')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	969
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	970 ui.status((str(cmd)), "\n")
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	971
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	972 def svnfindrev(ui, repo, args, *kwargs):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	973 cmdoptions = [
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	974 ]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	975 args, opts = parseoptions(ui, cmdoptions, args)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	976
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	977 cmd = Command('log')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	978 cmd['-r'] = args[0]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	979
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	980 ui.status((str(cmd)), "\n")
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	981
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	982 def svnrebase(ui, repo, args, *kwargs):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	983 cmdoptions = [
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	984 ('l', 'local', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	985 ]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	986 args, opts = parseoptions(ui, cmdoptions, args)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	987
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	988 pullcmd = Command('pull')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	989 pullcmd.append('default-push')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	990 rebasecmd = Command('rebase')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	991 rebasecmd.append('tip')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	992
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	993 cmd = pullcmd & rebasecmd
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	994
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	995 ui.status((str(cmd)), "\n")
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	996
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	997 def tag(ui, repo, args, *kwargs):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	998 cmdoptions = [
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	999 ('f', 'force', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1000 ('l', 'list', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1001 ('d', 'delete', None, ''),
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1002 ]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1003 args, opts = parseoptions(ui, cmdoptions, args)
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1004
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1005 if opts.get('list'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1006 cmd = Command('tags')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1007 else:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1008 cmd = Command('tag')
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1009 cmd.append(args[0])
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1010 if len(args) > 1:
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1011 cmd['-r'] = args[1]
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1012
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1013 if opts.get('delete'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1014 cmd['--remove'] = None
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1015
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1016 if opts.get('force'):
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1017 cmd['-f'] = None
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1018
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1019 ui.status((str(cmd)), "\n")
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1020
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1021 gitcommands = {
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1022 'add': add,
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1023 'am': am,
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1024 'apply': apply,
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1025 'bisect': bisect,
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1026 'blame': blame,
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1027 'branch': branch,
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1028 'checkout': checkout,
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1029 'cherry-pick': cherrypick,
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1030 'clean': clean,
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1031 'clone': clone,
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1032 'commit': commit,
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1033 'diff': diff,
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1034 'difftool': difftool,
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1035 'fetch': fetch,
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1036 'grep': grep,
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1037 'init': init,
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1038 'log': log,
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1039 'ls-files': lsfiles,
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1040 'merge': merge,
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1041 'merge-base': mergebase,
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1042 'mergetool': mergetool,
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1043 'mv': mv,
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1044 'pull': pull,
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1045 'push': push,
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1046 'rebase': rebase,
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1047 'reflog': reflog,
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1048 'reset': reset,
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1049 'revert': revert,
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1050 'rev-parse': revparse,
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1051 'rm': rm,
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1052 'show': show,
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1053 'stash': stash,
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1054 'status': status,
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1055 'svn': svn,
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1056 'tag': tag,
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1057 'whatchanged': deprecated,
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1058 }
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1059
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1060 gitsvncommands = {
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1061 'dcommit': svndcommit,
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1062 'fetch': svnfetch,
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1063 'find-rev': svnfindrev,
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1064 'rebase': svnrebase,
113281667205 githelp: vendor Facebook authored extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1065 }

Mercurial > public > mercurial-scm > hg-stable

annotate hgext/githelp.py @ 35719:a4cd8f527a7f