~abentley/bzrtools/bzrtools.dev

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
From Robey Pointer...

This exception:

[ 7114] Tue 22:37:07.305 ERROR: exceptions.TypeError: args must be a  sequence of strings, but was ('cat-log', '--dir', '/home/robey/code/ testing/baz2bzr-618h1D/rd', bzrlib.plugins.bzrtools- baz2bzr.pybaz.Revision('robey@lag.net--2003-public/secsh--dev--1.0-- base-0'))
  at /home/robey/code/bzrtools/pybaz/backends/forkexec.py line 254  in __init__
Traceback (most recent call last):
  File "/home/robey/code/bzr.dev/bzrlib/commands.py", line 557, in  run_bzr_catch_errors
    return run_bzr(argv)
  File "/home/robey/code/bzr.dev/bzrlib/commands.py", line 520, in  run_bzr
    ret = cmd_obj.run_argv(argv)
  File "/home/robey/code/bzr.dev/bzrlib/commands.py", line 233, in  run_argv
    return self.run(**all_cmd_args)
  File "/home/robey/.bazaar/plugins/bzrtools-baz2bzr/baz_import.py",  line 713, in run
    reuse_history_from=reuse_history_list)
  File "/home/robey/.bazaar/plugins/bzrtools-baz2bzr/baz_import.py",  line 398, in import_version
    max_count=max_count):
  File "/home/robey/.bazaar/plugins/bzrtools-baz2bzr/baz_import.py",  line 545, in iter_import_version
    tree, baz_inv, log = get_revision(revdir, revision)
  File "/home/robey/.bazaar/plugins/bzrtools-baz2bzr/baz_import.py",  line 643, in get_revision
    log = get_log(tree, revision)
  File "/home/robey/.bazaar/plugins/bzrtools-baz2bzr/baz_import.py",  line 638, in get_log
    assert str(log.revision) == str(revision), (log.revision, revision)
  File "/home/robey/.bazaar/plugins/bzrtools-baz2bzr/external/pybaz/ _patchlog.py", line 171, in _get_revision
    assert self.__revision == self['Archive']+'/'+self['Revision']
  File "/home/robey/.bazaar/plugins/bzrtools-baz2bzr/external/pybaz/ _patchlog.py", line 150, in __getitem__
    return self._parse()[header]
  File "/home/robey/.bazaar/plugins/bzrtools-baz2bzr/external/pybaz/ _patchlog.py", line 133, in _parse
    s = _backend().text_cmd(
  File "/home/robey/code/bzrtools/pybaz/backends/commandline.py",  line 141, in text_cmd
    status, text = self._get_spawner().status_text_cmd(args, chdir,  (0,))
  File "/home/robey/code/bzrtools/pybaz/backends/commandline.py",  line 240, in status_text_cmd
    return self._guess().status_text_cmd(*args, **kwargs)
  File "/home/robey/code/bzrtools/pybaz/backends/forkexec.py", line  62, in status_text_cmd
    logger=self._logger)
  File "/home/robey/code/bzrtools/pybaz/backends/forkexec.py", line  107, in exec_safe_status_stdout
    proc = ChildProcess(program, args, expected, chdir, logger)
  File "/home/robey/code/bzrtools/pybaz/backends/forkexec.py", line  254, in __init__
    raise TypeError(


is fixed by this tiny patch to pybaz:

--- orig/pybaz/_patchlog.py
+++ mod/pybaz/_patchlog.py
@@ -99,7 +99,7 @@
             if not p.has_archive() or not p.has_patchlevel:
                 raise errors.NamespaceError(revision,
                                             'fully-qualified  revision')
-            self.__revision = revision
+            self.__revision = str(revision)
         if tree is None:
             self.__tree = None
         else:



I'm sure that's fixing the symptom and not the bug, but it was  sufficient for me to migrate paramiko, so I thought I'd share it.

robey