countFlag moved to lab.nexedi.com/kirr/go123/xflag

to

	xflag.Count

git-backup.go

@@ -79,6 +79,7 @@ import (
     "lab.nexedi.com/kirr/go123/mem"
     "lab.nexedi.com/kirr/go123/myname"
     "lab.nexedi.com/kirr/go123/xerr"
+    "lab.nexedi.com/kirr/go123/xflag"
     "lab.nexedi.com/kirr/go123/xstrings"
 
     git "github.com/libgit2/git2go"
@@ -961,8 +962,8 @@ func usage() {
 func main() {
     flag.Usage = usage
     quiet := 0
-    flag.Var((*countFlag)(&verbose), "v", "verbosity level")
-    flag.Var((*countFlag)(&quiet), "q", "decrease verbosity")
+    flag.Var((*xflag.Count)(&verbose), "v", "verbosity level")
+    flag.Var((*xflag.Count)(&quiet), "q", "decrease verbosity")
     flag.IntVar(&njobs, "j", njobs, "allow max N jobs to spawn")
     flag.Parse()
     verbose -= quiet

misc.go

-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file (in go.git repository).
-
-package main
-
-import (
-    "flag"
-    "fmt"
-    "strconv"
-)
-
-// flag that is both bool and int - for e.g. handling -v -v -v ...
-// inspired/copied by/from cmd.dist.count in go.git
-type countFlag int
-
-func (c *countFlag) String() string {
-    return fmt.Sprint(int(*c))
-}
-
-func (c *countFlag) Set(s string) error {
-    switch s {
-    case "true":
-        *c++
-    case "false":
-        *c = 0
-    default:
-        n, err := strconv.Atoi(s)
-        if err != nil {
-            return fmt.Errorf("invalid count %q", s)
-        }
-        *c = countFlag(n)
-    }
-    return nil
-}
-
-// flag.boolFlag
-func (c *countFlag) IsBoolFlag() bool {
-    return true
-}
-
-// flag.Value
-var _ flag.Value = (*countFlag)(nil)