hg-to-git: add --verbose option

This patch adds an option to make hg-to-git quiet by default.  Note:
it only suppresses those messages that would be printed when everything
was up-to-date.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Acked-by: Stelian Pop <stelian@popies.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/hg-to-git/hg-to-git.py b/contrib/hg-to-git/hg-to-git.py
index d72ffbb7773268514d8de29c5d5c33fdaf31f339..f68ef725d42cdb1a6082574f9ef3a45d2346c296 100755 (executable)
--- a/contrib/hg-to-git/hg-to-git.py
+++ b/contrib/hg-to-git/hg-to-git.py
@@ -46,6 +46,7 @@ def usage():
                          for incrementals
     -n, --nrepack=INT:   number of changesets that will trigger
                          a repack (default=0, -1 to deactivate)
                          for incrementals
     -n, --nrepack=INT:   number of changesets that will trigger
                          a repack (default=0, -1 to deactivate)

+    -v, --verbose:       be verbose

 
 required:
     hgprj:  name of the HG project to import (directory)
 
 required:
     hgprj:  name of the HG project to import (directory)


@@ -75,15 +76,18 @@ def getgitenv(user, date):
 
 state = ''
 opt_nrepack = 0
 
 state = ''
 opt_nrepack = 0

+verbose = False

 
 try:
 
 try:

-    opts, args = getopt.getopt(sys.argv[1:], 's:t:n:', ['gitstate=', 'tempdir=', 'nrepack='])
+    opts, args = getopt.getopt(sys.argv[1:], 's:t:n:v', ['gitstate=', 'tempdir=', 'nrepack=', 'verbose'])

     for o, a in opts:
         if o in ('-s', '--gitstate'):
             state = a
             state = os.path.abspath(state)
         if o in ('-n', '--nrepack'):
             opt_nrepack = int(a)
     for o, a in opts:
         if o in ('-s', '--gitstate'):
             state = a
             state = os.path.abspath(state)
         if o in ('-n', '--nrepack'):
             opt_nrepack = int(a)

+        if o in ('-v', '--verbose'):
+            verbose = True

     if len(args) != 1:
         raise('params')
 except:
     if len(args) != 1:
         raise('params')
 except:


@@ -95,17 +99,20 @@ def getgitenv(user, date):
 
 if state:
     if os.path.exists(state):
 
 if state:
     if os.path.exists(state):

-        print 'State does exist, reading'
+        if verbose:
+            print 'State does exist, reading'

         f = open(state, 'r')
         hgvers = pickle.load(f)
     else:
         print 'State does not exist, first run'
 
 tip = os.popen('hg tip --template "{rev}"').read()
         f = open(state, 'r')
         hgvers = pickle.load(f)
     else:
         print 'State does not exist, first run'
 
 tip = os.popen('hg tip --template "{rev}"').read()

-print 'tip is', tip
+if verbose:
+    print 'tip is', tip

 
 # Calculate the branches
 
 # Calculate the branches

-print 'analysing the branches...'
+if verbose:
+    print 'analysing the branches...'

 hgchildren["0"] = ()
 hgparents["0"] = (None, None)
 hgbranch["0"] = "master"
 hgchildren["0"] = ()
 hgparents["0"] = (None, None)
 hgbranch["0"] = "master"


@@ -232,7 +239,8 @@ def getgitenv(user, date):
 
 # write the state for incrementals
 if state:
 
 # write the state for incrementals
 if state:

-    print 'Writing state'
+    if verbose:
+        print 'Writing state'

     f = open(state, 'w')
     pickle.dump(hgvers, f)
 
     f = open(state, 'w')
     pickle.dump(hgvers, f)