diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2010-06-27 23:28:23 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@frugalware.org> | 2010-06-27 23:28:23 +0200 |
| commit | b62f2c999c49cd67eba1910ffb34d033fc464c23 (patch) | |
| tree | a16b3f6b6fb9a0ab381282e115126fd6c13201b4 | |
| parent | 96c183fe4c622c7c2d9b1a2a5413baf622369328 (diff) | |
| download | python-fastimport-b62f2c999c49cd67eba1910ffb34d033fc464c23.tar.gz | |
darcs-fast-import: add --progress switch
| -rwxr-xr-x | exporters/darcs/darcs-fast-import | 13 | ||||
| -rw-r--r-- | exporters/darcs/darcs-fast-import.txt | 6 |
2 files changed, 18 insertions, 1 deletions
diff --git a/exporters/darcs/darcs-fast-import b/exporters/darcs/darcs-fast-import index ff788fa..75116a7 100755 --- a/exporters/darcs/darcs-fast-import +++ b/exporters/darcs/darcs-fast-import @@ -268,7 +268,7 @@ class Handler: self.export_marks.append(":%s %s" % (self.mark_num, hash)) def handle_progress(self, s): - print "progress [%s] %s" % (time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()), s.strip()) + print "import progress [%s] %s" % (time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()), s.strip()) sys.stdout.flush() def handle_opts(self): @@ -284,6 +284,8 @@ class Handler: help="log file which contains the output of external programs invoked during the conversion") opp.add_option("--symhack", action="store_true", dest="symhack", help="Do not error out when a symlink would be created, just create it in the workdir") + opp.add_option("--progress", metavar="P", + help="insert progress statements after every n commit [default: 100]") (self.options, args) = opp.parse_args() if self.options.logfile: @@ -291,6 +293,11 @@ class Handler: else: logfile = "_darcs/import.log" self.logsock = open(os.path.abspath(logfile), "a") + + if self.options.progress: + self.prognum = int(self.options.progress) + else: + self.prognum = 0 def log(self, s): self.logsock.write("[%s] %s" % (time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()), s)) @@ -318,6 +325,7 @@ class Handler: self.handle_opts() self.handle_import_marks() + commitcount = 0 while not self.eof: self.read_next_line() if not len(self.line[:-1]): @@ -326,6 +334,9 @@ class Handler: self.handle_blob() elif self.line.startswith("commit"): self.handle_commit() + commitcount += 1 + if self.prognum != 0 and commitcount % self.prognum == 0: + self.handle_progress("%d patches" % commitcount) elif self.line.startswith("tag"): self.handle_tag() elif self.line.startswith("reset"): diff --git a/exporters/darcs/darcs-fast-import.txt b/exporters/darcs/darcs-fast-import.txt index 9e885bd..a7f2a12 100644 --- a/exporters/darcs/darcs-fast-import.txt +++ b/exporters/darcs/darcs-fast-import.txt @@ -42,6 +42,12 @@ as well, via the --import-marks / --export-marks switches. subdirectory. So the hack can be useful, but be extremely careful when you use it. +--progress=<n>:: + Insert progress statements after every <n> created patches. The + default is not to print anything as progress info is usually provided by + the exporter. Use this option in case the exporter does not have such a + switch but you still want to get some feedback. + == EXIT CODES The exit code is: |