Problemas de Bazaar por solucionar

7.6.2008

mkdir dos
cd dos
git init
echo més >prova
file prova # Check it's utf-8
iconv -f utf-8 -t iso-8859-1 prova >prova.8859
git add prova prova.8859
git commit -a -m inici
git-fast-export --all >expo
iconv -f utf-8 -t utf-8 expo >/dev/null # Will show you an error

Según #git no es fallo de git-fast-export pues vuelca todo en crudo. Mezcla por tanto codificaciones. Los importadores deberían tener todo esto en cuenta.

En bzr:

• Se arregló el fallo el 19-5-2008. ŭ https://bugs.launchpad.net/bzr-fastimport/+bug/230996
• „Rev 76 has fixes for these decoding bugs.“
• bzr 1.5 es del 16-5; es con el que vi el fallo.
• bzr 1.6b1 es del 2-6.

Solución final:

• probar con bzr>1.5

Esto ya está mal:

self._dirblocks[1]
('', [(('', 'prova', 'prova-20081011104329-9z25aw23tznwvfnp-1'), [('a', '', 0, False, ''), ('l', u'm\xe9s'0, False, 'dcl441-bugs@yahoo.com-20081011104330-aoma828b7t0x1kap')])])
(Pdb) self._dirblocks[1]

p self._dirblocks[1][1][0][1][1][1]
u'm\xe9s'

(Pdb) self._dirblocks[1][1][0][1][1][1].encode("utf-8")
'm\xc3\xa9s'

Ya se llama, con esto mal puesto, a: def _entries_to_current_state(self, new_entries): ¿Quién lo llama?

  /w/bzr/bug_272444/bzr(130)<module>()
-> exit_val = bzrlib.commands.main(sys.argv)
  /Werkstatt/bzr/bug_272444/bzrlib/commands.py(840)main()
-> ret = run_bzr_catch_errors(argv)
  /Werkstatt/bzr/bug_272444/bzrlib/commands.py(849)run_bzr_catch_errors()
-> return run_bzr(argv)
  /Werkstatt/bzr/bug_272444/bzrlib/commands.py(795)run_bzr()
-> ret = run(*run_argv)
  /Werkstatt/bzr/bug_272444/bzrlib/commands.py(495)run_argv_aliases()
-> return self.run(**all_cmd_args)
  /Werkstatt/bzr/bug_272444/bzrlib/builtins.py(980)run()
-> force_new_repo=standalone)
  /Werkstatt/bzr/bug_272444/bzrlib/bzrdir.py(1137)sprout()
-> hardlink=hardlink)
  /Werkstatt/bzr/bug_272444/bzrlib/bzrdir.py(1451)create_workingtree()
-> accelerator_tree=accelerator_tree, hardlink=hardlink)
  /Werkstatt/bzr/bug_272444/bzrlib/workingtree_4.py(1387)initialize()
-> wt.set_parent_trees(parents_list, allow_leftmost_as_ghost=True)
  /Werkstatt/bzr/bug_272444/bzrlib/mutabletree.py(52)tree_write_locked()
-> return unbound(self, *args, **kwargs)
  /Werkstatt/bzr/bug_272444/bzrlib/workingtree_4.py(1127)set_parent_trees()
-> dirstate.set_parent_trees(real_trees, ghosts=ghosts)
  /Werkstatt/bzr/bug_272444/bzrlib/dirstate.py(2290)set_parent_trees()
-> self._entries_to_current_state(new_entries)
> /Werkstatt/bzr/bug_272444/bzrlib/dirstate.py(1026)_entries_to_current_state()
-> if entry[0][0] != current_dirname:

Al final lo „corrijo“ poniendo sólo:

inv_entry.symlink_target.encode('utf-8') or ''

en vez de llamar a str(…)

Pero sigue fallando… con mi propio test:

Traceback (most recent call last):
  File "/Werkstatt/bzr/bug_24yt5/bzrlib/tests/workingtree_implementations/test_parents.py", line 241, in test_utf8_symlink
    revision = tree.commit('added a link to an utf-8 target')
  File "/Werkstatt/bzr/bug_24yt5/bzrlib/decorators.py", line 192, in write_locked
    result = unbound(self, *args, **kwargs)
  File "/Werkstatt/bzr/bug_24yt5/bzrlib/workingtree_4.py", line 237, in commit
    result = WorkingTree3.commit(self, message, revprops, *args, **kwargs)
  File "/Werkstatt/bzr/bug_24yt5/bzrlib/decorators.py", line 192, in write_locked
    result = unbound(self, *args, **kwargs)
  File "/Werkstatt/bzr/bug_24yt5/bzrlib/mutabletree.py", line 197, in commit
    revprops=revprops, *args, **kwargs)
  File "/Werkstatt/bzr/bug_24yt5/bzrlib/commit.py", line 412, in commit
    self._basis_delta)
  File "/Werkstatt/bzr/bug_24yt5/bzrlib/workingtree_4.py", line 1277, in update_basis_by_delta
    self.current_dirstate().update_basis_by_delta(delta, new_revid)
  File "/Werkstatt/bzr/bug_24yt5/bzrlib/dirstate.py", line 1341, in update_basis_by_delta
    inv_to_entry(inv_entry), True))
  File "/Werkstatt/bzr/bug_24yt5/bzrlib/dirstate.py", line 1851, in _inv_entry_to_details
    fingerprint = inv_entry.symlink_target.encode('utf-8') or ''
UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in position 3: ordinal not in range(128)

----------------------------------------------------------------------
Ran 3 tests in 1.549s

A ver…

1853 ->                fingerprint = inv_entry.symlink_target.encode('utf-8') or ''                                       

Claro

(Pdb) p inv_entry.symlink_target
'adi\xc3\x83\xc2\xb3s'
(Pdb) p inv_entry.symlink_target.encode('utf-8')
UnicodeDecodeError: UnicodeDecodeError('ascii', 'adi\xc3\x83\xc2\xb3s', 3, 4, 'ordinal not in range(128)')

(Pdb) p delta[0][3].symlink_target
'adi\xc3\x83\xc2\xb3s'


(Pdb) p self._basis_delta
[(None, u'', 'tree_root-20081011184217-sdy2f0k6tpofp1y9-1', InventoryDirectory('tree_root-20081011184217-sdy2f0k6tpofp1y9-1', u'', parent_id=None, revision='dc@ali-20081011184217-8loc0uuq15qgjtoy')), (None, u'link_name', 'link-id', InventoryLink('link-id', u'link_name', parent_id='tree_root-20081011184217-sdy2f0k6tpofp1y9-1', revision='dc@ali-20081011184217-8loc0uuq15qgjtoy'))]
(Pdb) p self._basis_delta[1][3].symlink_target
'adi\xc3\x83\xc2\xb3s'
(Pdb) 

Aquí ya lo está leyendo mal, en el readlink…

714              elif kind == 'symlink':
715  ->                return ('symlink', None, None, os.readlink(abspath))

Problema: creo que no es que no lo lea bien. Es que mi test NO LO ESCRIBE bien.

: ~ ; ll '/tmp/testbzr-UhnsTF.tmp/bzrlib.tests.workingtree_implementations.test_parents.TestSetParents.test_utf8_symlink(WorkingTreeFormat4)/work/tree1/link_name'
lrwxrwxrwx 1 dc dc 8 oct 11 21:07 /tmp/testbzr-UhnsTF.tmp/bzrlib.tests.workingtree_implementations.test_parents.TestSetParents.test_utf8_symlink(WorkingTreeFormat4)/work/tree1/link_name -> adiós

Al menos sé cómo descubrir dónde está mi repo: abspath = self.abspath(path)

• CONCLUSIÓN escrita el <16.m02.2009 20:50>
  mentira; fingerprint ha de ser utf8 y ya va bien

Soluciones:

• sólo permitir enlaces a destino Unicode
• usar como huella alguna otra cosa (ej: hash)
• usar una huella sin codificación unicode

Estu os.symlink('adi33s','tree1/link2')

Estaba creando el enlace hacia:

adiós

En vez de hacia:

adiós

Ya en set_parent_trees al principio:

p trees[0][1].inventory['link2-id'].symlink_target
u'adi\xf3s'

Creo que eso no está bien… no por lo del 3 (parece correcto) sino por meter un objeto de tipo unicode (debería ser str). Aunque no entiendo de esto…

En set_parent_ids (de WorkingTree4) se complica…:

(Pdb) p self.branch.repository.revision_tree(revision_ids[0]).inventory['link2-id'].symlink_target

NOTA: en esa línea se ve muy rápido un repaso de muchos conceptos de Bazaar

Al final, ¡llegué al test! Así se ve el destino del enblance:

tree = self.make_branch_and_tree('tree1')                                                                      
#import pdb                                                                                                    
#pdb.set_trace()                                                                                               
                                                                                                               
os.symlink('adi\xc3\xb3s','tree1/link2')                                                                       
tree.add(['link2'],['link2-id'])                                                                               
revision = tree.commit('added a second link to an utf-8 target')                                               
                                                                                                               
print "ahora mismo (en el test), el enlace ya está algo mal: ", tree.branch.repository.revision_tree(revision).inventory['link2-id'].symlink_target                                                                                   
                                                                                                               
#try:                                                                                                          
#    tree.set_parent_ids([revision])                                                                           
tree.set_parent_ids([revision])                                                                                
#except UnicodeEncodeError, e:                                                                                 
#    raise KnownFailure('there is no support for symlinks to non-ASCII targets')                               

                                                                                                               

Fórmula mágica: tree.branch.repository.revision_tree(revision).inventory['link2-id'].symlink_target

Quizás con tree.inventory también va. Pero no hay que coger el inventory['TREE_ROOT']

Veo que en mutabletree 133 le hace:

self._add(files, ids, kinds)                                                                                   

y ahí se añade al inventario. Pero no le pone el valor:

p self.inventory['link2-id'].symlink_target
None

Y en test justo antes del commit:

(Pdb) p tree.inventory['link2-id'].symlink_target
None

Creo que es el commit el que graba contenido.

Entro en:

826                  self._record_entry(path, file_id, specific_files, kind, name,
827  ->                    parent_id, definitely_changed, existing_ie, report_changes,
828                      content_summary)

He encontrado algo muy importante: repository.py, 384

elif kind == 'symlink':                                                                                        
     current_link_target = content_summary[3]                                                                   
     if not store:                                                                                              
         # symlink target is not generic metadata, check if it has                                              
         # changed.                                                                                             
         if current_link_target != parent_entry.symlink_target:                                                 
             store = True                                                                                       
     if not store:                                                                                              
         # unchanged, carry over.                                                                               
         ie.revision = parent_entry.revision                                                                    
         ie.symlink_target = parent_entry.symlink_target                                                        
         return self._get_delta(ie, basis_inv, path), False, None                                               
     ie.symlink_target = current_link_target                                                                    
     lines = []                                                                                                 
     self._add_text_to_weave(ie.file_id, lines, heads, None)                                                    

ie.symlink_target = current_link_target

Bien, ambos de tipo str y con valor 'adi33s'

Me salto esto:

2410 ->            for key, size in key_sizes:
2411                 p_offset, p_length = self._container_writer.add_bytes_record(
2412                     raw_data[offset:offset+size], [])
2413                 offset += size

Y:

752                  parents = ()
753              return self._add(key, lines, parents,
754  ->                parent_texts, left_matching_blocks, nostore_sha, random_id)

Me parece que por la zona del 422 de repository.py se ha dado valor (bueno) a ie.symlink_target

A ver cuando empieza a hacer esto…:

875  ->            if delta:
876                  self._basis_delta.append(delta)

Pues no, se dev. bien

Quizás en xml8.py, 239, …

243                              parent_str, parent_id,
244                              _encode_and_escape(ie.revision),
245                              _encode_and_escape(ie.symlink_target)))
(Pdb) p ie.symlink_target
'adi\xc3\xb3s'
(Pdb) p _encode_and_escape(ie.symlink_target)
'adiós"'
(Pdb) 

Bueno… lo graba bien. Quizás si luego lo lee es cuando hay problemas.

Ya he visto que falla bzrlib/dirstate.py(1861)_inv_entry_to_details() al entrar por 2ª vez; en la parte de set_parents_id (creo que la otra, la que se ocupa del commit, va bien).

(Pdb) p fingerprint
'adi\xc3\xb3s'
(Pdb) bt
  /tmp/testbzr-YrnJ8d.tmp/bzrlib.tests.workingtree_implementations.test_parents.TestSetParents.test_utf8_symlink(WorkingTreeFormat4)/work/bzr(130)<module>()
-> exit_val = bzrlib.commands.main(sys.argv)
  /Werkstatt/bzr/bug_24yt5/bzrlib/commands.py(840)main()
-> ret = run_bzr_catch_errors(argv)
  /Werkstatt/bzr/bug_24yt5/bzrlib/commands.py(849)run_bzr_catch_errors()
-> return run_bzr(argv)
  /Werkstatt/bzr/bug_24yt5/bzrlib/commands.py(795)run_bzr()
-> ret = run(*run_argv)
  /Werkstatt/bzr/bug_24yt5/bzrlib/commands.py(495)run_argv_aliases()
-> return self.run(**all_cmd_args)
  /Werkstatt/bzr/bug_24yt5/bzrlib/builtins.py(2828)run()
-> starting_with=starting_with,
  /Werkstatt/bzr/bug_24yt5/bzrlib/tests/__init__.py(2589)selftest()
-> strict=strict)
  /Werkstatt/bzr/bug_24yt5/bzrlib/tests/__init__.py(2529)run_suite()
-> result = runner.run(suite)
  /Werkstatt/bzr/bug_24yt5/bzrlib/tests/__init__.py(543)run()
-> test.run(result)
  /usr/lib/python2.5/unittest.py(433)run()
-> test(result)
  /usr/lib/python2.5/unittest.py(281)__ c a l l __()
-> return self.run(*args, **kwds)
  /Werkstatt/bzr/bug_24yt5/bzrlib/tests/__init__.py(1293)run()
-> return unittest.TestCase.run(self, result)
  /usr/lib/python2.5/unittest.py(260)run()
-> testMethod()
  /Werkstatt/bzr/bug_24yt5/bzrlib/tests/workingtree_implementations/test_parents.py(248)test_utf8_symlink()
-> revision = tree.commit('added a second link to an utf-8 target')
  /Werkstatt/bzr/bug_24yt5/bzrlib/decorators.py(192)write_locked()
-> result = unbound(self, *args, **kwargs)
  /Werkstatt/bzr/bug_24yt5/bzrlib/workingtree_4.py(238)commit()
-> result = WorkingTree3.commit(self, message, revprops, *args, **kwargs)
  /Werkstatt/bzr/bug_24yt5/bzrlib/decorators.py(192)write_locked()
-> result = unbound(self, *args, **kwargs)
  /Werkstatt/bzr/bug_24yt5/bzrlib/mutabletree.py(201)commit()
-> revprops=revprops, *args, **kwargs)
  /Werkstatt/bzr/bug_24yt5/bzrlib/commit.py(419)commit()
-> self._basis_delta)
  /Werkstatt/bzr/bug_24yt5/bzrlib/workingtree_4.py(1281)update_basis_by_delta()
-> self.current_dirstate().update_basis_by_delta(delta, new_revid)
  /Werkstatt/bzr/bug_24yt5/bzrlib/dirstate.py(1346)update_basis_by_delta()
-> inv_to_entry(inv_entry), True))
> /Werkstatt/bzr/bug_24yt5/bzrlib/dirstate.py(1862)_inv_entry_to_details()
-> size = 0

(Pdb) p fingerprint
u'adi\xf3s'
(Pdb) bt
  /tmp/testbzr-Q3X6ES.tmp/bzrlib.tests.workingtree_implementations.test_parents.TestSetParents.test_utf8_symlink(WorkingTreeFormat4)/work/bzr(130)<module>()
-> exit_val = bzrlib.commands.main(sys.argv)
  /Werkstatt/bzr/bug_24yt5/bzrlib/commands.py(840)main()
-> ret = run_bzr_catch_errors(argv)
  /Werkstatt/bzr/bug_24yt5/bzrlib/commands.py(849)run_bzr_catch_errors()
-> return run_bzr(argv)
  /Werkstatt/bzr/bug_24yt5/bzrlib/commands.py(795)run_bzr()
-> ret = run(*run_argv)
  /Werkstatt/bzr/bug_24yt5/bzrlib/commands.py(495)run_argv_aliases()
-> return self.run(**all_cmd_args)
  /Werkstatt/bzr/bug_24yt5/bzrlib/builtins.py(2828)run()
-> starting_with=starting_with,
  /Werkstatt/bzr/bug_24yt5/bzrlib/tests/__init__.py(2589)selftest()
-> strict=strict)
  /Werkstatt/bzr/bug_24yt5/bzrlib/tests/__init__.py(2529)run_suite()
-> result = runner.run(suite)
  /Werkstatt/bzr/bug_24yt5/bzrlib/tests/__init__.py(543)run()
-> test.run(result)
  /usr/lib/python2.5/unittest.py(433)run()
-> test(result)
  /usr/lib/python2.5/unittest.py(281)__ c a l l __()
-> return self.run(*args, **kwds)
  /Werkstatt/bzr/bug_24yt5/bzrlib/tests/__init__.py(1293)run()
-> return unittest.TestCase.run(self, result)
  /usr/lib/python2.5/unittest.py(260)run()
-> testMethod()
  /Werkstatt/bzr/bug_24yt5/bzrlib/tests/workingtree_implementations/test_parents.py(259)test_utf8_symlink()
-> tree.set_parent_ids([revision])
  /Werkstatt/bzr/bug_24yt5/bzrlib/mutabletree.py(53)tree_write_locked()
-> return unbound(self, *args, **kwargs)
  /Werkstatt/bzr/bug_24yt5/bzrlib/workingtree_4.py(1090)set_parent_ids()
-> allow_leftmost_as_ghost=allow_leftmost_as_ghost)
  /Werkstatt/bzr/bug_24yt5/bzrlib/mutabletree.py(53)tree_write_locked()
-> return unbound(self, *args, **kwargs)
  /Werkstatt/bzr/bug_24yt5/bzrlib/workingtree_4.py(1131)set_parent_trees()
-> dirstate.set_parent_trees(real_trees, ghosts=ghosts)
  /Werkstatt/bzr/bug_24yt5/bzrlib/dirstate.py(2249)set_parent_trees()
-> self._inv_entry_to_details(entry)
> /Werkstatt/bzr/bug_24yt5/bzrlib/dirstate.py(1862)_inv_entry_to_details()
-> size = 0
(Pdb) 

• CONCLUSIÓN escrita el <16.m02.2009 20:49>
  no sé qué es esto

En repository.py:

elif kind == 'symlink':
    current_link_target = content_summary[3]
    if not store:
        # symlink target is not generic metadata, check if it has
        # changed.
        import pdb; pdb.set_trace()
        if current_link_target != parent_entry.symlink_target:
            store = True

• current_link_target vale: '9' (bien)
• parent_entry.symlink_target vale: u'03a9' (¡mal!)

(Pdb) p parent_invs[0]['link-id'].symlink_target
u'\u03a9'

elif kind == 'symlink':
    current_link_target = content_summary[3]
    if not store:
        # symlink target is not generic metadata, check if it has
        # changed.
        if current_link_target != parent_entry.symlink_target:
            store = True

elif kind == 'symlink':
    inv_entry.executable = False
    inv_entry.text_size = None
    inv_entry.symlink_target = utf8_decode(fingerprint)[0]

Después de leer mucho y recopilar muchos comentarios:

• al leer un „destino de enlace simbólico“ (ddes) de disco, hay que decodificarlo mediante la cod. del sifi hacia Unicode
• al crear un ddes en disco, hay que codificarlo desde Unicode hacia la cod. del sifi
• sin embargo, internamente usamos Unicode y utf-8: Unicode para todos los objetos en memoria, utf-8 para los en disco
• ŭJAM (John Arbash Meinel, autoridad en esto): el fichero dirstate se ha de grabar en UTF-8
• ŭJAM el „texto del inventario“ se ha de grabar en utf-8
• ŭ1 dirstate tiene una parte en disco (fichero) pero luego se pasa a memoria; la parte discada va en utf-8 y la memorizada en Unicode
• todas las cadenas de dirstate van en utf-8, lo pone en dirstate.py. Dijo JAM en marzo de 2007 que se refactorizó para ganar eficiencia: dirstante procede en utf-8 pero luego lo pasa a las capas superiores en Unicode, que es más cómodo
• fingerprint, debido a ser de dirstate, también es una cadena utf-8 que contiene el ddes. No es Unicode
• ŭ1JAM y con mucha convicción inv_entry.symlink_target debería ser Unicode

• CONCLUSIÓN escrita el <16.m02.2009 16:01>
  me ayudó a mejorar y a probar otras cosas; sigo probando (ver más abajo)

file:///w/bzr/arra272444_ene09/bzrlib/workingtree.py

cd /n; bzr=/w/bzr/arra272444_ene09/bzr;  rm -rf br1 br2; mkdir br1; cd br1; $bzr init .; touch més; ln -s més prova; $bzr add prova; $bzr commit -m "link to utf-8 file name"; cd ..; $bzr branch br1 br2

=== modified file 'workingtree.py'
--- workingtree.py	2009-01-18 05:25:19 +0000
+++ workingtree.py	2009-01-20 22:28:59 +0000
@@ -304,7 +304,7 @@
             if os.path.islink(self.abspath(relpath)):
                 file = InventoryLink(id, os.path.basename(relpath), parent_id)
                 file.revision = revid
-                file.symlink_target = os.readlink(self.abspath(relpath))
+                file.symlink_target = os.readlink(self.abspath(relpath).encode(osutils._fs_enc))
                 file.text_sha1 = None
                 file.text_size = None
                 file.executable = False
@@ -658,7 +658,7 @@
         elif kind == 'directory':
             return kind, None, None, None
         elif kind == 'symlink':
-            return ('symlink', None, None, os.readlink(abspath))
+            return ('symlink', None, None, os.readlink(abspath.encode(osutils._fs_enc)))
         else:
             return (kind, None, None, None)

@@@@@@@@@@142857, invtext:  <type 'str'>
@@@@@ amb contingut:  1dcl441-bugs@yahoo.com-20090121124657-p9tpltb4b4apbl1y
0
TREE_ROOTd0nxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxd0ndcl441-bugs@yahoo.com-20090121124657-p9tpltb4b4apbl1y
provaprova-20090121124656-2kluxcf86nk8s591-1l0nxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxlmés0ndcl441-bugs@yahoo.com-20090121124657-p9tpltb4b4apbl1y

bzr: ERROR: exceptions.UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in position 267: ordinal not in range(128)

Traceback (most recent call last):

• CONCLUSIÓN escrita el <16.m02.2009 20:48>
  ya me la he apuntado en un dibujo; ver sacado en claro: decisiones sobre codificaciones. <2009-02-16 dl 20:59>

Email from John Arbash Meinel: Re: {MERGE}{1.12}{URGENT} Fix

cd /n; bzr=/w/bzr/arra272444_feb09/bzr;  rm -rf br1 br2; mkdir br1; cd br1; $bzr init .; touch més; ln -s més prova; $bzr add prova; $bzr commit -m "link to utf-8 file name"; cd ..; $bzr branch br1 br2

print "[44444  142857, inv_entry.symlink_target (-u Unicode, JAM): ", type(inv_entry.symlink_target)
# 16.2.2009: seguir buscando el origen; alguien lo mete como str y eso es malo

====22  142857, inv_entry.symlink_target (-u Unicode, JAM):  <type 'NoneType'>
====22b  142857, inv_entry.symlink_target (-u Unicode, JAM):  <type 'NoneType'>
ddddddd2: acabo de poner ie.symlink_target= més  de tipo  <type 'str'>
added prova
[55555  142857, inv_entry.symlink_target (-u Unicode, JAM):  <type 'NoneType'>

ie.symlink_target = current_link_target
print "ddddddd2: acabo de poner ie.symlink_target=", ie.symlink_target, " de tipo ", type(ie.symlink_target)

=== modified file 'bzrlib/repository.py'
--- bzrlib/repository.py	2009-01-27 07:48:55 +0000
+++ bzrlib/repository.py	2009-02-16 19:43:04 +0000
@@ -469,6 +469,9 @@
             self._add_text_to_weave(ie.file_id, lines, heads, None)
         elif kind == 'symlink':
             current_link_target = content_summary[3]
+            # puede que me toque pasarlo a Unicode
+            current_link_target = content_summary[3].decode("utf-8")
+            
             if not store:

----------------------------------------------------------------------
Ran 15 tests in 7.951s

OK
tests passed                                                                                                

time ./bzr selftest --no-plugins

: /w/bzr ; bzr.dev diff --old oficial --new arra272444_feb09_limpio/ 
=== modified file 'bzrlib/dirstate.py'
--- bzrlib/dirstate.py	2009-01-28 10:38:03 +0000
+++ bzrlib/dirstate.py	2009-02-16 20:32:15 +0000
@@ -1866,8 +1866,8 @@
             size = 0
             executable = False
         elif kind == 'symlink':
-            # We don't support non-ascii targets for symlinks yet.
-            fingerprint = str(inv_entry.symlink_target or '')
+            # fingerprint is always a utf-8 string (not unicode)
+            fingerprint = inv_entry.symlink_target.encode("utf-8") or ''
             size = 0
             executable = False
         elif kind == 'file':
@@ -1952,6 +1952,8 @@
         output_lines = [DirState.HEADER_FORMAT_3]
         lines.append('') # a final newline
         inventory_text = '\0\n\0'.join(lines)
+
+        # all the inventory text is in utf-8 and therefore zlib.crc32 is valid
         output_lines.append('crc32: %s\n' % (zlib.crc32(inventory_text),))
         # -3, 1 for num parents, 1 for ghosts, 1 for final newline
         num_entries = len(lines)-3

=== modified file 'bzrlib/inventory.py'
--- bzrlib/inventory.py	2008-12-11 20:59:28 +0000
+++ bzrlib/inventory.py	2009-02-16 20:36:36 +0000
@@ -662,7 +662,10 @@
     def _put_on_disk(self, fullpath, tree):
         """See InventoryEntry._put_on_disk."""
         try:
-            os.symlink(self.symlink_target, fullpath)
+            # the link target (now in unicode) must be created in disk using the
+            # file system encoding, so that it still works across systems with
+            # differents encodings
+            os.symlink(self.symlink_target.encode(osutils._fs_enc), fullpath)
         except OSError,e:
             raise BzrError("Failed to create symlink %r -> %r, error: %s" % (fullpath, self.symlink_target, e))
 

=== modified file 'bzrlib/repository.py'
--- bzrlib/repository.py	2009-01-27 07:48:55 +0000
+++ bzrlib/repository.py	2009-02-16 20:38:21 +0000
@@ -469,6 +469,10 @@
             self._add_text_to_weave(ie.file_id, lines, heads, None)
         elif kind == 'symlink':
             current_link_target = content_summary[3]
+            # The symlink_target in an inventory entry should always be Unicode.
+            # Currently we have it stored in disk in utf-8, so we must decode.
+            current_link_target = content_summary[3].decode("utf-8")
+            
             if not store:
                 # symlink target is not generic metadata, check if it has
                 # changed.

=== modified file 'bzrlib/workingtree_4.py'
--- bzrlib/workingtree_4.py	2008-12-22 08:44:20 +0000
+++ bzrlib/workingtree_4.py	2009-02-16 20:40:13 +0000
@@ -1697,9 +1697,8 @@
         if entry[1][parent_index][0] != 'l':
             return None
         else:
-            # At present, none of the tree implementations supports non-ascii
-            # symlink targets. So we will just assume that the dirstate path is
-            # correct.
+            # Support for non-ascii symlink targets is being worked on (bug #272444).
+            # We will just assume now that the dirstate path is correct.
             return entry[1][parent_index][1]
 
     def get_revision_id(self):

: /w/bzr ; 

La versión ésta: versión limpia contra bzr.dev, pasa los tests

: /w/bzr/arre_272444 ; bzr.dev send lp:bzr -o ../fix_272444_v1.patch

y funciona bien

cd ; git fast-export -M -C --all | (cd ~/n; rm -rf cacba3; mkdir cacba3; cd cacba3; bzr.dev init; time bzr.dev fast-import -)

• CONCLUSIÓN escrita el <15.m03.2009 16:46>
  a mí me va, falta integrarlo

El <04.m03.2009 15:25>:

  File "/home/dc/.bazaar/plugins/fastimport/processors/generic_processor.py", line 404, in commit_handler
    handler.process()
  File "/home/dc/.bazaar/plugins/fastimport/processor.py", line 200, in process
    handler(self, fc)
  File "/home/dc/.bazaar/plugins/fastimport/bzr_commit_handler.py", line 391, in modify_handler
    filecmd.is_executable, data, self.inventory)
  File "/home/dc/.bazaar/plugins/fastimport/bzr_commit_handler.py", line 183, in _modify_item
    ie.symlink_target = data.encode('utf8')
UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in position 1: ordinal not in range(128)

Tocar: file:///home/dc/.bazaar/plugins/fastimport/bzr_commit_handler.py

Pruebo:

#ie.symlink_target = data.encode('utf8')
# 142857
ie.symlink_target = data

: ~/n/cacba ; (cd ~ ; git fast-export -M -C --all ; cd -)  | time /w/bzr/arra272444_feb09_limpio/bzr fast-import -
15:36:12 1000 commits processed (:9259)
fatal: Could not read blob b2117bd27d42c6660240a464859b92cd0b5ee454
bzr: ERROR: line 8248944: Invalid command '/home/dc/n/cacba'
Command exited with non-zero status 3
888.76user 27.58system 15:45.38elapsed 96%CPU (0avgtext+0avgdata 0maxresident)k
96inputs+134360outputs (0major+5755752minor)pagefaults 0swaps

cd ; git fast-export -M --all | (cd /n; rm -rf cacba; mkdir cacba; cd cacba; bzr.dev init; time /w/bzr/arra272444_feb09_limpio/bzr fast-import -)

fatal: Could not read blob b2117bd27d42c6660240a464859b92cd0b5ee454
16:10:15 Updating branch information ...
las partes  []  category:  stash  ref_name:  refs/stash  y  ['refs/stash']
bzr: ERROR: exceptions.IndexError: list index out of range

Traceback (most recent call last):
…
  File "/home/dc/.bazaar/plugins/fastimport/branch_updater.py", line 58, in update
    branch_tips, lost_heads = self._get_matching_branches()
  File "/home/dc/.bazaar/plugins/fastimport/branch_updater.py", line 84, in _get_matching_branches
    git_to_bzr_map = self.name_mapper.git_to_bzr(ref_names)
  File "/home/dc/.bazaar/plugins/fastimport/branch_mapper.py", line 40, in git_to_bzr
    name_no_ext = self._git_to_bzr_name(parts[-1])
IndexError: list index out of range

: ~ ; cd ; git fast-export -M -C --all | (cd /n; rm -rf cacba; mkdir cacba; cd cacba; bzr.dev init; time /w/bzr/arra272444_feb09_limpio/bzr fast-import -)
Created a standalone tree (format: pack-0.92)
16:29:03 1000 commits processed (:9259)
fatal: Could not read blob b2117bd27d42c6660240a464859b92cd0b5ee454
16:36:36 Updating branch information ...
	 branch cacba now has 1221 revisions and 0 tags
16:36:36 Imported 1790 revisions, updating 1 branch and 0 trees in 0:14:55
To refresh the working tree for a branch, use 'bzr update'.

real	14m55.195s
user	14m0.977s
sys	0m26.346s
: ~ ; 

 File "/home/dc/.bazaar/plugins/fastimport/processors/generic_processor.py", line 807, in _modify_inventory
   ie.symlink_target = data.encode('utf8')
UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in position 1: ordinal not in range(128)

bzr: ERROR: exceptions.UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in position 1: ordinal not in range(128)

bzr push lp:~n142857/bzr-fastimport/unicode-symlinks -v

cd /n; rm -rf tres enbzr; mkdir tres; cd tres; git init; touch més; ln -s més prova; git add més prova; git commit -a -m "link to a file with a name in utf-8"; git fast-export --all >expo; mkdir enbzr; cd enbzr; bzr init; bzr fast-import ../expo

cd /n; rm -rf quatre enbzr; mkdir quatre; cd quatre; git init; touch més; ln -s més prova; git add més prova; git commit -a -m "link to a file with a name in utf-8"; cp -l prova prova2; git add prova2; git commit -a -m "copied symlink"; git mv prova provab; git commit -a -m "moved symlink"; rm provab; touch més2; ln -s més2 provab; git commit -a -m "modified symlink destination"; git rm provab; git commit -a -m "deleted symlink"; git fast-export --all >expo; mkdir enbzr; cd enbzr; bzr init; bzr fast-import ../expo

-M 100644 :1 més
-M 120000 :2 prova
 
+M 644 :1 més
+M 120000 :2 prova

+
 from :3
 M 120000 :2 prova2
-
+blob
+mark :2
+data 4
+més
 commit refs/heads/master
 mark :5
 author Daniel Clemente Laboreo <dc@ali.(none)> 1256944975 +0100
 committer Daniel Clemente Laboreo <dc@ali.(none)> 1256944975 +0100
 data 14
 moved symlink
+

• CONCLUSIÓN escrita el <22.m10.2009 17:41>
  ya no falla o lo he evitado de alguna otra forma

: ~ ; cd ; git fast-export -M -C --all > ~/n/mirepogit && (echo fin de git ; cd ~/n; rm -rf repoCasaBzr; mkdir repoCasaBzr; cd repoCasaBzr; bzr.dev init; time bzr.dev fast-import ~/n/mirepogit)
…
/Werkstatt/bzr/oficial/bzrlib/inventory.py:850: UnicodeWarning: Unicode equal comparison failed to convert both arguments to Unicode - interpreting them as being unequal
  delta if np is not None):
bzr: ERROR: exceptions.UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in position 15: ordinal not in range(128)

Traceback (most recent call last):
  File "/Werkstatt/bzr/oficial/bzrlib/commands.py", line 727, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/Werkstatt/bzr/oficial/bzrlib/commands.py", line 922, in run_bzr
    ret = run(*run_argv)
  File "/Werkstatt/bzr/oficial/bzrlib/commands.py", line 559, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/home/dc/.bazaar/plugins/fastimport/__init__.py", line 221, in run
    params, verbose)
  File "/home/dc/.bazaar/plugins/fastimport/__init__.py", line 75, in _run
    return proc.process(p.iter_commands)
  File "/home/dc/.bazaar/plugins/fastimport/processor.py", line 92, in process
    self._process(command_iter)
  File "/home/dc/.bazaar/plugins/fastimport/processors/generic_processor.py", line 269, in _process
    processor.ImportProcessor._process(self, command_iter)
  File "/home/dc/.bazaar/plugins/fastimport/processor.py", line 114, in _process
    handler(self, cmd)
  File "/home/dc/.bazaar/plugins/fastimport/processors/generic_processor.py", line 458, in commit_handler
    handler.process()
  File "/home/dc/.bazaar/plugins/fastimport/processor.py", line 201, in process
    self.post_process_files()
  File "/home/dc/.bazaar/plugins/fastimport/bzr_commit_handler.py", line 534, in post_process_files
    lambda revision_ids: self._get_inventories(revision_ids))
  File "/home/dc/.bazaar/plugins/fastimport/revision_store.py", line 236, in load_using_delta
    rev_id, basis_inv, inv_delta, present_parents, parent_invs)
  File "/home/dc/.bazaar/plugins/fastimport/revision_store.py", line 313, in _add_inventory_by_delta
    inv_delta, revision_id, parents)
  File "/Werkstatt/bzr/oficial/bzrlib/repository.py", line 1032, in add_inventory_by_delta
    basis_inv.apply_delta(delta)
  File "/Werkstatt/bzr/oficial/bzrlib/inventory.py", line 850, in apply_delta
    delta if np is not None):
UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in position 15: ordinal not in range(128)

bzr 1.14dev on python 2.5.4 (linux2)
arguments: ['/usr/local/bin/bzr.dev', 'fast-import', '/home/dc/n/mirepogit']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'es_ES.UTF-8'
plugins:
  bzrtools             /home/dc/.bazaar/plugins/bzrtools [1.13]
  fastimport           /home/dc/.bazaar/plugins/fastimport [0.8dev]
  gtk                  /home/dc/.bazaar/plugins/gtk [0.96.0.dev.1]
  launchpad            /Werkstatt/bzr/oficial/bzrlib/plugins/launchpad [unknown]
  netrc_credential_store /Werkstatt/bzr/oficial/bzrlib/plugins/netrc_credential_store [unknown]
  qbzr                 /home/dc/.bazaar/plugins/qbzr [0.9.9dev]
…

real    33m9.397s
user    25m36.172s
sys    0m47.507s

: ~ ; time git fast-export -M -C --all >n/todomigit
fatal: Could not read blob b2117bd27d42c6660240a464859b92cd0b5ee454

real    0m24.628s
user    0m21.269s
sys    0m2.212s
: ~ ; 

• CONCLUSIÓN escrita el <18.m05.2009 19:59>
  Creo que esto se solucionó, era porque muse era un subproyecto con su propio .git. La nueva versión de git lo trataba bien

1221 Daniel Clemente   2009-01-20
     más

1220 Daniel Clemente   2009-01-20
     ignoradas más cosas

1219 Daniel Clemente   2009-01-20
     preta per veure canvis a repositori git i després portar-los

La siguiente revisión que tocaba era:

traigo muse de CVS; actualización importante pues tenía 3.11, muy antiguo

Nada especial, creo.

Es por el error de b2117. Es justo donde acaba el fast-export :-(

• CONCLUSIÓN escrita el <24.m03.2009 16:54>
  se solucionó con git 1.6

Esto ya lo reproduce:

git fast-export 933292c8f537d932c0401829ab64834d7bf6f7e0..f9b4a22460d304cb11a892e9c7e1ceb4f804b913

Pues b2117bd27d42c6660240a464859b92cd0b5ee454 está en medio.

commit (null)
mark :1
author Daniel Clemente <dc@CPU107.(none)> 1232480834 +0100
committer Daniel Clemente <dc@CPU107.(none)> 1232480834 +0100
data 76
traigo muse de CVS; actualización importante pues tenía 3.11, muy antiguo
M 160000 b2117bd27d42c6660240a464859b92cd0b5ee454 .emacs.d/muse
D .emacs.d/muse/.gitignore
D .emacs.d/muse/Makefile
D .emacs.d/muse/muse-autoloads.el

commit f9b4a22460d304cb11a892e9c7e1ceb4f804b913
Author: Daniel Clemente <dc@CPU107.(none)>
Date:   Tue Jan 20 20:47:14 2009 +0100

    traigo muse de CVS; actualización importante pues tenía 3.11, muy antiguo

diff --git a/.emacs.d/muse b/.emacs.d/muse
new file mode 160000
index 0000000..b2117bd
--- /dev/null
+++ b/.emacs.d/muse
@@ -0,0 +1 @@
+Subproject commit b2117bd27d42c6660240a464859b92cd0b5ee454
diff --git a/.emacs.d/muse/.gitignore b/.emacs.d/muse/.gitignore
deleted file mode 100644
index b70794e..0000000
--- a/.emacs.d/muse/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-# Files that we ignore when using git.
-
-*~
-/++xgit-log-edit
-*.elc
-/Makefile.defs
-/lisp/muse-autoloads.el
-/texi/muse.info
-/texi/muse.html
…

• CONCLUSIÓN escrita el <18.m05.2009 19:53>
  No encontró nada en CPU107 un –strict –full

dangling blob 655465f104bfb6e58388e3882b3f002e432c804f
dangling blob a194dfd2051e862a82d32ef7220f9088927b5d58
dangling blob b0d44ecf904cdd0585076d8d2ac7873da432c90d
dangling blob ba14588a97ce04739dde313311724dbb2a42aa22
dangling commit f2143bfad53fd1d5aeb16d08150b02e9264fb931
dangling blob 1d558b18a7cf7e5f0f64987f29f65533947cf87f
dangling blob 21159922dd9767f36ad5f55f1d74b017e1cdc758
dangling blob 3015cf7ecd95bb2de0adcb029f5d50c21ea96580

: git-fsck --strict --full:

real    0m34.204s
user    0m31.550s
sys    0m1.236s

: ~ ;  git-fsck --strict --full |wc
    380    1140   20912

: ~/n/cacba2 ; time /w/bzr/arra272444_feb09_limpio/bzr  log -p -r 1220
------------------------------------------------------------
revno: 1220
committer: Daniel Clemente <dc@CPU107.(none)>
timestamp: Tue 2009-01-20 18:29:53 +0100
message:
  ignoradas más cosas
diff:
=== modified file '.gitignore'
--- .gitignore	2009-01-20 10:40:11 +0000
+++ .gitignore	2009-01-20 17:29:53 +0000
@@ -202,6 +202,7 @@
 /.cvsps
 /.arch-params
 /.bzr.log
+/.bzr.log.old
 /.bazaar/gannotate.conf
 /.bazaar/qbzr.conf
 /.bazaar/locations.conf
@@ -264,6 +265,7 @@
bzr: ERROR: exceptions.UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in position 4: ordinal not in range(128)

Traceback (most recent call last):
  File "/home/w/bzr/arra272444_feb09_limpio/bzrlib/commands.py", line 921, in run_bzr_catch_errors
    return run_bzr(argv)
  File "/home/w/bzr/arra272444_feb09_limpio/bzrlib/commands.py", line 866, in run_bzr
    ret = run(*run_argv)
  File "/home/w/bzr/arra272444_feb09_limpio/bzrlib/commands.py", line 547, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/home/w/bzr/arra272444_feb09_limpio/bzrlib/commands.py", line 881, in ignore_pipe
    result = func(*args, **kwargs)
  File "/home/w/bzr/arra272444_feb09_limpio/bzrlib/builtins.py", line 2095, in run
    show_diff=show_diff)
  File "/home/w/bzr/arra272444_feb09_limpio/bzrlib/log.py", line 182, in show_log
    start_revision, end_revision, search, limit, show_diff)
  File "/home/w/bzr/arra272444_feb09_limpio/bzrlib/log.py", line 239, in _show_log
    lf.log_revision(lr)
  File "/home/w/bzr/arra272444_feb09_limpio/bzrlib/log.py", line 1248, in log_revision
    self.show_diff(to_file, revision.diff, indent)
  File "/home/w/bzr/arra272444_feb09_limpio/bzrlib/log.py", line 1193, in show_diff
    to_file.write(indent + '%s\n' % (l,))
  File "/usr/lib/python2.5/codecs.py", line 303, in write
    data, consumed = self.encode(object, self.errors)
UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in position 4: ordinal not in range(128)

: ~/n/cacba2 ; time /w/bzr/arra272444_feb09_limpio/bzr  diff -c 1220
=== modified file '.gitignore'
--- .gitignore	2009-01-20 10:40:11 +0000
+++ .gitignore	2009-01-20 17:29:53 +0000
@@ -202,6 +202,7 @@
 /.cvsps
 /.arch-params
 /.bzr.log
+/.bzr.log.old
 /.bazaar/gannotate.conf
 /.bazaar/qbzr.conf
 /.bazaar/locations.conf
@@ -264,6 +265,7 @@
 # más de emacs
 /.org-timestamps
 /.org-id-locations
+/.emacs.d/.org-id-locations
 /.projects.ede
 /.ecb-tip-of-day.el
 /.abbrev_defs
@@ -321,6 +323,8 @@

https://bugs.launchpad.net/bzr/+bug/328007/

bzr 1.6b2, del 10 de junio de 2008, incluye entre otras cosas:

• Squash ``inv_entry.symlink_target`` to a plain string when generating DirState details. This prevents from getting a ``UnicodeError`` when you have symlinks and non-ascii filenames. (John Arbash Meinel, #135320)

https://bugs.launchpad.net/bzr/+bug/135320

Aunque dicen que aún falla.

Lo he probado un poco y veo que no se me arregla porque quien falla es fast-import. He escrito en #135320 una referencia al mío, 238365

• CONCLUSIÓN escrita el <09.m02.2009 01:35>
  sigue el informerro; en la lista se habló poco

• project-command Run some command(s) for project components. [scmproj]
• project-commit Commit changes in components working copies. [scmproj]
• project-get Get a copy of an existing project on your local disk. [scmproj]
• project-info Show info summary for project. [scmproj]
• project-init Initialize new top-level branch for the project. [scmproj]
• project-publish Publish (push back) changes from components branches and control branch. [scmproj]
• project-update Update components of the project from their origins. [scmproj]

I have a project that I would like to break up into several independently developed subprojects. Each is useful on its own and I would like to make them available independently. I think that part is not difficult. Then I'd like to configure a master bzr branch that pulls in a branch from each of the subprojects, and tracks changes in each of the subproject branches. Is this possible with bzr?

This is more or less what https://launchpad.net/bzr-scmproj does for you. It is still quite new/alpha. But I already find it extremely useful for this sort of use case.

Quizás me estoy dejando algo, pero…

• no está integrada (interfaz distinta para cada herramienta)
• da errores raros incomprensibles (Not a branch: /home/dc/desaweb/oficial)
• no se entiende qué está haciendo (o si hace algo); siempre dice Pulling
• no da información sobre qué revisiones ha traído
• no es oficial

Instaŀlat

Va molt bé. Però i el pull?

• CONCLUSIÓN escrita el <18.m05.2009 19:44>
  escrito a lista ahora mismo

Por curiosidad pues ya me irá bien una por una manualmente.

• CONCLUSIÓN escrita el <09.m06.2009 20:27>
  No, ver abajo.

Es justo lo que quiero.

+Brad has a single project with a lot of related branches. He works on +them and occasionally pushes all of those branches to a remote host +using a single push command.

• CONCLUSIÓN escrita el <09.m06.2009 20:27>
  Me dijeron sobre mi comentario: ,-—

  Subtract loom and colocated branches, which are

  for switching among closely related branches of the same basic

  content,

  `-—

Vaya, entenderlo cuesta más de lo que esperaba. 10 min. era poco.

• decidir dónde va cada cosa
  • terminal.py

danielcl@danielclemente.com [~/ut/bzr-1.12rc1]# ./bzr
Traceback (most recent call last):
  File "./bzr", line 79, in <module>
    import locale
  File "/usr/lib/python2.6/locale.py", line 15, in <module>
    import functools
  File "/usr/lib/python2.6/functools.py", line 10, in <module>
    from _functools import partial, reduce
ImportError: No module named _functools
danielcl@danielclemente.com [~/ut/bzr-1.12rc1]# 

danielcl@danielclemente.com [~]# python -c "import site" -v
'import site' failed; use -v for traceback
Traceback (most recent call last):
  File "<string>", line 1, in ?
  File "/usr/lib/python2.6/site.py", line 150
    with f:
         ^
SyntaxError: invalid syntax

danielcl@danielclemente.com [~]# python2.6 /usr/lib/python2.6/site.py
sys.path = [
    '/root/lib/python2.6',
    '/usr/lib/python2.6',
    '/usr/lib/python2.6/lib/python26.zip',
    '/usr/lib/python2.6/lib/python2.6',
    '/usr/lib/python2.6/lib/python2.6/plat-linux2',
    '/usr/lib/python2.6/lib/python2.6/lib-tk',
    '/usr/lib/python2.6/lib/python2.6/lib-old',
    '/usr/lib/python2.6/lib/python2.6/lib-dynload',
]
USER_BASE: '/home7/danielcl/.local' (doesn't exist)
USER_SITE: '/home7/danielcl/.local/lib/python2.6/site-packages' (doesn't exist)
ENABLE_USER_SITE: True
danielcl@danielclemente.com [~]# python2.6 -c "import site"

danielcl@danielclemente.com [~]# python2.6 -c "import site" -v
danielcl@danielclemente.com [~]#

danielcl@danielclemente.com [~]# python2.6 -c "import time" -v
Traceback (most recent call last):
  File "<string>", line 1, in <module>
ImportError: No module named time
danielcl@danielclemente.com [~]# 

stat("time", 0x7fff1a342dc0)            = -1 ENOENT (No such file or directory)
open("time.so", O_RDONLY)               = -1 ENOENT (No such file or directory)
open("timemodule.so", O_RDONLY)         = -1 ENOENT (No such file or directory)
open("time.py", O_RDONLY)               = -1 ENOENT (No such file or directory)
open("time.pyc", O_RDONLY)              = -1 ENOENT (No such file or directory)
stat("/usr/lib/python2.6/time", 0x7fff1a342dc0) = -1 ENOENT (No such file or directory)
open("/usr/lib/python2.6/time.so", O_RDONLY) = -1 ENOENT (No such file or directory)
open("/usr/lib/python2.6/timemodule.so", O_RDONLY) = -1 ENOENT (No such file or directory)
open("/usr/lib/python2.6/time.py", O_RDONLY) = -1 ENOENT (No such file or directory)
open("/usr/lib/python2.6/time.pyc", O_RDONLY) = -1 ENOENT (No such file or directory)
stat("/root/lib/debug/usr/python2.6-bin/lib/python2.6/lib-dynload/time", 0x7fff1a342dc0) = -1 ENOENT (No such file or directory)
open("/root/lib/debug/usr/python2.6-bin/lib/python2.6/lib-dynload/time.so", O_RDONLY) = -1 ENOENT (No such file or directory)
open("/root/lib/debug/usr/python2.6-bin/lib/python2.6/lib-dynload/timemodule.so", O_RDONLY) = -1 ENOENT (No such file or directory)
open("/root/lib/debug/usr/python2.6-bin/lib/python2.6/lib-dynload/time.py", O_RDONLY) = -1 ENOENT (No such file or directory)
open("/root/lib/debug/usr/python2.6-bin/lib/python2.6/lib-dynload/time.pyc", O_RDONLY) = -1 ENOENT (No such file or directory)
futex(0x795680, FUTEX_WAKE, 1)          = 0

/root/lib/debug/usr/python2.6-bin/lib/python2.6/lib-dynload

/root/lib64/python2.3/lib-dynload/timemodule.so

danielcl@danielclemente.com [~/ut/lib/python-2.6/lib-dynload]# cp /root/lib/debug/usr/python2.6-bin/lib/python2.6/lib-dynload/* .
rename .so.debug .so *

PYTHONPATH=$PYTHONHOME:/home7/danielcl/ut/lib/python-2.6/lib-dynload

danielcl@danielclemente.com [~]# python2.6 -c "import time" -v
Speicherzugriffsfehler

export PYTHONPATH=$PYTHONHOME:/root/lib64/python2.3/lib-dynload/

danielcl@danielclemente.com [~]# python2.6 -c "import time" -v
Traceback (most recent call last):
  File "<string>", line 1, in <module>
ImportError: /root/lib64/python2.3/lib-dynload/timemodule.so: undefined symbol: Py_InitModule4

danielcl@danielclemente.com [~/repoweb]# bzr branch bzr+ssh://dc@glass.dreamhost.com/home/dc/danielclemente.com/ preoficial
ssh: connect to host glass.dreamhost.com port 22: Connection timed out
bzr: ERROR: Connection closed: please check connectivity and permissions (and try -Dhpss if further diagnosis is required)

Sí por el 80.

Pues hale, me queda sólo: bzr branch http://www.danielclemente.com/ preoficial que funciona.

: ~/desaweb/estructura ; bzr push bzr+ssh://danielcl@host296.hostmonster.com/home7/danielcl/repoweb/estructura
danielcl@host296.hostmonster.com's password: 
bash: bzr: command not found
bzr: ERROR: Connection closed: please check connectivity and permissions (and try -Dhpss if further diagnosis is required)

: ~/desaweb/estructura ; BZR_REMOTE_PATH=/home7/danielcl/bin/bzr time bzr push bzr+ssh://danielcl@host296.hostmonster.com/home7/danielcl/repoweb/estructura -Dhpss
danielcl@host296.hostmonster.com's password: 
Created new branch.                                                                                                           
HPSS calls: 108 <bzrlib.smart.medium.SmartSSHClientMedium object at 0x84d30ac>
1.06user 0.15system 0:35.95elapsed 3%CPU (0avgtext+0avgdata 0maxresident)k
632inputs+88outputs (0major+5747minor)pagefaults 0swaps

• estructura
• minis
• ruido
• ne oficial, ĉar ne necesas

Ĉiuj el ali. Facile kaj rapide

• CONCLUSIÓN escrita el <10.m05.2009 23:48>
  Ver abajo

Si no, me revierto al sistema de tener una rama „casi oficial“ en HostMonster que no lo es porque aún le falta ser pasada a DreamHost. Y ese intermediario es el que quiero evitar

<28.m04.2009 16:30> me dijo esto

: ~/repoweb/preoficial ; b push
Using saved push location: bzr+ssh://danielcl@host296.hostmonster.com/home7/danielcl/repoweb/preoficial/
running "ssh danielcl@host296.hostmonster.com /home7/danielcl/bin/bzr update "/home7/danielcl/repoweb/preoficial/""                                                               
 M  apuntes/catala.html
 M  apuntes/catala.t2t
All changes applied successfully.
Updated to revision 10.
This transport does not update the working tree of: bzr+ssh://danielcl@host296.hostmonster.com/home7/danielcl/repoweb/preoficial/. See 'bzr help working-trees' for more information.
Pushed up to revision 10.

: ~/repoweb ; b branch bzr+ssh://dc@glass.dreamhost.com/home/dc/danielclemente.com/ ofinial

Muy rápido