renaming out of directory with unicode name fails with InconsistentDelta

[Christian Tschabuschnig]

Importing a SVN-dump with
bzr svn-import -v --standalone --trees ../subversion_dump_20080122 BZR
completes without error. When I try to rename a directory containing non-ASCII-characters
the following bzr commit fails. The error is shown here: http://launchpadlibrarian.net/11488753/trace2.txt

[Christian Tschabuschnig (tschaboo)]

After several tries, I was able to reproduce the problem, starting with an empty repository.
I attached three of them. It seems that the problem only appears if it's a directory which
has files in it.

[Jelmer Vernooij (jelmer)]

Hi Christian,

On Wed, Jan 23, 2008 at 01:30:40AM -0000, Christian Tschabuschnig wrote:
> After several tries, I was able to reproduce the problem, starting with an empty repository.
> I attached three of them. It seems that the problem only appears if it's a directory which
> has files in it.

> ** Attachment added: "history.txt"
> http://launchpadlibrarian.net/11489882/history.txt
Thanks, this is extremely useful to be able to fix this bug. I'll have a
look at fixing it in the next couple of days. It shouldn't be too hard,
probably just a missing .encode/.decode call somewhere.

Cheers,

Jelmer

--

[Jelmer Vernooij (jelmer)]

I just reconfirmed this without using bzr-svn.

[Jelmer Vernooij (jelmer)]

This is not a bzr-svn issue, the attached shell script reproduces it by using just core Bazaar.

[Robert Collins (lifeless)]

This indicates a dirstate delta update bug - we need to examine this urgently.

[Robert Collins (lifeless)]

Here is a minimal version of the failure as shell:

[Ismail Onur Filiz (onurf)]

I am not sure if it is the same bug, but I can obtain the same backtrace with the attached shell script, independent of an encoding issue.

I basically split a subdirectory of a repository. If the subdirectory is empty, everything is fine. But if it contains a versioned file, I hit the bug.

[codeslinger (codeslinger)]

it sounds like there are two bugs here?

but the problem with special chars in a file name is probably a dup of Bug #135320

[Martin Pool (mbp)]

Robert's script still fails in bzr 2.2dev as follows:

0.827 Traceback (most recent call last):
  File "/home/mbp/bzr/trunk/bzrlib/commands.py", line 835, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/home/mbp/bzr/trunk/bzrlib/commands.py", line 1039, in run_bzr
    ret = run(*run_argv)
  File "/home/mbp/bzr/trunk/bzrlib/commands.py", line 643, in run_argv_aliases
    return self.run_direct(**all_cmd_args)
  File "/home/mbp/bzr/trunk/bzrlib/commands.py", line 647, in run_direct
    return self._operation.run_simple(*args, **kwargs)
  File "/home/mbp/bzr/trunk/bzrlib/cleanup.py", line 122, in run_simple
    self.cleanups, self.func, *args, **kwargs)
  File "/home/mbp/bzr/trunk/bzrlib/cleanup.py", line 156, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/home/mbp/bzr/trunk/bzrlib/builtins.py", line 3167, in run
    exclude=safe_relpath_files(tree, exclude))
  File "/home/mbp/bzr/trunk/bzrlib/decorators.py", line 194, in write_locked
    result = unbound(self, *args, **kwargs)
  File "/home/mbp/bzr/trunk/bzrlib/workingtree_4.py", line 197, in commit
    result = WorkingTree3.commit(self, message, revprops, *args, **kwargs)
  File "/home/mbp/bzr/trunk/bzrlib/decorators.py", line 194, in write_locked
    result = unbound(self, *args, **kwargs)
  File "/home/mbp/bzr/trunk/bzrlib/mutabletree.py", line 225, in commit
    *args, **kwargs)
  File "/home/mbp/bzr/trunk/bzrlib/commit.py", line 257, in commit
    possible_master_transports=possible_master_transports)
  File "/home/mbp/bzr/trunk/bzrlib/cleanup.py", line 118, in run
    self.cleanups, self.func, self, *args, **kwargs)
  File "/home/mbp/bzr/trunk/bzrlib/cleanup.py", line 156, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/home/mbp/bzr/trunk/bzrlib/commit.py", line 431, in _commit
    self.builder.get_basis_delta())
  File "/home/mbp/bzr/trunk/bzrlib/workingtree_4.py", line 1258, in update_basis_by_delta
    self.current_dirstate().update_basis_by_delta(delta, new_revid)
  File "/home/mbp/bzr/trunk/bzrlib/dirstate.py", line 1542, in update_basis_by_delta
    self._update_basis_apply_adds(adds)
  File "/home/mbp/bzr/trunk/bzrlib/dirstate.py", line 1609, in _update_basis_apply_adds
    'working tree does not contain new entry')
InconsistentDelta: An inconsistent delta was supplied involving 'abc\x93\xc3\x83\xc5\x93abc/bar', 'bar-20100315043854-tn8t7n0kt4upkuj8-2'
reason: working tree does not contain new entry