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

annotate hgext/githelp.py @ 35716:05b8adf38c55

githelp: recommend `hg import` for `git am` This referenced a third party extension. It doesn't feel appropriate to do that from a core extension. Reference `hg import` instead. Differential Revision: https://phab.mercurial-scm.org/D1724

author	Gregory Szorc <gregory.szorc@gmail.com>
date	Fri, 22 Dec 2017 18:38:29 -0700
parents	8dbd000f7de9
children	5edfead8cc95

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

Mercurial > public > mercurial-scm > hg

annotate hgext/githelp.py @ 35716:05b8adf38c55