diff options
author | Miklos Vajna <vmiklos@frugalware.org> | 2010-06-27 19:00:08 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@frugalware.org> | 2010-06-27 19:00:08 +0200 |
commit | c7dd88b999c09f1689cdc6460ffd947dea7d57bb (patch) | |
tree | 9923c2cc1d878aaf8710f4c786cdc9e57567dbf3 /exporters | |
parent | ca8d573ab98e5c10e51293df66963cf696b6e0b5 (diff) | |
download | bzr-fastimport-c7dd88b999c09f1689cdc6460ffd947dea7d57bb.tar.gz |
darcs-fast-import: do not silently ignore darcs failures
Diffstat (limited to 'exporters')
-rwxr-xr-x | exporters/darcs/darcs-fast-import | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/exporters/darcs/darcs-fast-import b/exporters/darcs/darcs-fast-import index a7a4834..0c658eb 100755 --- a/exporters/darcs/darcs-fast-import +++ b/exporters/darcs/darcs-fast-import @@ -104,6 +104,10 @@ class Handler: items = s.split(' ') return " ".join(items[:-1]) + " " + tz + " " + items[-1] + def invoke_darcs(self, cmdline): + if os.system("darcs %s" % cmdline) != 0: + self.bug("darcs failed") + def handle_mark(self): if self.line.startswith("mark :"): self.mark_num = int(self.line[6:-1]) @@ -191,11 +195,11 @@ class Handler: if path in self.files: self.files.remove(path) elif self.line.startswith("R "): - os.system("darcs mv %s" % self.line[2:]) + self.invoke_darcs("mv %s" % self.line[2:]) elif self.line.startswith("C "): src, dest = self.line[:-1].split(' ')[1:] shutil.copy(src.strip('"'), dest.strip('"')) - os.system("darcs add %s" % dest) + self.invoke_darcs("add %s" % dest) elif self.line.startswith("M "): items = self.line.split(' ') if items[1] == "120000": @@ -226,7 +230,7 @@ class Handler: break for i in adds: - os.system("darcs add %s" % i) + self.invoke_darcs("add %s" % i) sock = subprocess.Popen(["darcs", "record", "--ignore-times", "-a", "--pipe"], stdin=subprocess.PIPE, stdout=subprocess.PIPE) buf = [self.date, self.ident, self.short, self.long] sock.stdin.write("\n".join(buf)) |