提交 3e619174 编写于 作者: K kfcampbell

More minor updates.

上级 9c9a489b
......@@ -24,6 +24,7 @@ func (cmd Cmd) String() string {
return fmt.Sprintf("%s %s", cmd.Name, strings.Join(cmd.Args, " "))
}
// WithArg returns the current argument
func (cmd *Cmd) WithArg(arg string) *Cmd {
cmd.Args = append(cmd.Args, arg)
......
......@@ -79,7 +79,7 @@ func transformCloneArgs(args *Args) {
for _, i := range p.PositionalIndices {
a := args.Params[i]
if nameWithOwnerRegexp.MatchString(a) && !isCloneable(a) {
url := getCloneUrl(a, isSSH, args.Command != "submodule")
url := getCloneURL(a, isSSH, args.Command != "submodule")
args.ReplaceParam(i, url)
}
break
......@@ -95,7 +95,7 @@ func parseClonePrivateFlag(args *Args) bool {
return false
}
func getCloneUrl(nameWithOwner string, isSSH, allowSSH bool) string {
func getCloneURL(nameWithOwner string, isSSH, allowSSH bool) string {
name := nameWithOwner
owner := ""
if strings.Contains(name, "/") {
......
......@@ -62,16 +62,16 @@ func (c *Command) parseArguments(args *Args) error {
}
args.Flag = utils.NewArgsParserWithUsage("-h, --help\n" + knownFlags)
if rest, err := args.Flag.Parse(args.Params); err == nil {
if args.Flag.Bool("--help") {
return &ErrHelp{err: c.Synopsis()}
}
args.Params = rest
args.Terminator = args.Flag.HasTerminated
return nil
} else {
rest, err := args.Flag.Parse(args.Params)
if err != nil {
return fmt.Errorf("%s\n%s", err, c.Synopsis())
}
if args.Flag.Bool("--help") {
return &ErrHelp{err: c.Synopsis()}
}
args.Params = rest
args.Terminator = args.Flag.HasTerminated
return nil
}
func (c *Command) Use(subCommand *Command) {
......
......@@ -149,7 +149,6 @@ var compareUnescaper = strings.NewReplacer(
func rangeQueryEscape(r string) string {
if strings.Contains(r, "..") {
return r
} else {
return compareUnescaper.Replace(url.QueryEscape(r))
}
return compareUnescaper.Replace(url.QueryEscape(r))
}
......@@ -143,9 +143,9 @@ func create(command *Command, args *Args) {
args.Before("git", "remote", "add", "-f", originName, url)
}
webUrl := project.WebURL("", "", "")
webURL := project.WebURL("", "", "")
args.NoForward()
flagCreateBrowse := args.Flag.Bool("--browse")
flagCreateCopy := args.Flag.Bool("--copy")
printBrowseOrCopy(args, webUrl, flagCreateBrowse, flagCreateCopy)
printBrowseOrCopy(args, webURL, flagCreateBrowse, flagCreateCopy)
}
......@@ -189,14 +189,12 @@ func displayManPage(manPage string, args *Args, isWeb bool) error {
func lookupCmd(name string) *Command {
if strings.HasPrefix(name, "hub-") {
return CmdRunner.Lookup(strings.TrimPrefix(name, "hub-"))
} else {
cmd := CmdRunner.Lookup(name)
if cmd != nil && !cmd.GitExtension {
return cmd
} else {
return nil
}
}
cmd := CmdRunner.Lookup(name)
if cmd != nil && !cmd.GitExtension {
return cmd
}
return nil
}
func customCommands() []string {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册