Bug #733991 “bzr log --include-merges bombs” : Bugs : Bazaar

Revision history for this message

Jelmer Vernooij (jelmer) wrote on 2011-03-12: Re: [Bug 733991] [NEW] bzr log --include-merges bombs

#1

On Sat, 2011-03-12 at 19:53 +0000, Denys Duchier wrote:
> Public bug reported:
>
> I "bzr branch'ed" off a bzr/svn branch, make a mod and a commit, then merged it back into the bzr/svn branch.
> now "bzr log" bombs when I want to see merges.
>
> bzr: ERROR: bzrlib.errors.NoSuchRevision:
> <bzrlib.plugins.svn.cache.tdbcache.TdbRevisionIdMapCache object at
> 0x9a81bcc> has no revision 1
>
> Traceback (most recent call last):
> File "/home/denys/lib/python/bzrlib/commands.py", line 926, in exception_to_return_code
> return the_callable(*args, **kwargs)
> File "/home/denys/lib/python/bzrlib/commands.py", line 1126, in run_bzr
> ret = run(*run_argv)
> File "/home/denys/lib/python/bzrlib/commands.py", line 691, in run_argv_aliases
> return self.run(**all_cmd_args)
> File "/home/denys/lib/python/bzrlib/commands.py", line 713, in run
> return self._operation.run_simple(*args, **kwargs)
> File "/home/denys/lib/python/bzrlib/cleanup.py", line 135, in run_simple
> self.cleanups, self.func, *args, **kwargs)
> File "/home/denys/lib/python/bzrlib/cleanup.py", line 165, in _do_with_cleanups
> result = func(*args, **kwargs)
> File "/home/denys/lib/python/bzrlib/commands.py", line 1141, in ignore_pipe
> result = func(*args, **kwargs)
> File "/home/denys/lib/python/bzrlib/builtins.py", line 2511, in run
> Logger(b, rqst).show(lf)
> File "/home/denys/lib/python/bzrlib/log.py", line 343, in show
> self._show_body(lf)
> File "/home/denys/lib/python/bzrlib/log.py", line 367, in _show_body
> for lr in generator.iter_log_revisions():
> File "/home/denys/lib/python/bzrlib/log.py", line 405, in iter_log_revisions
> for revs in revision_iterator:
> File "/home/denys/lib/python/bzrlib/log.py", line 933, in _make_revision_objects
> revisions = repository.get_revisions(revision_ids)
> File "/home/denys/.bazaar/plugins/svn/repository.py", line 994, in get_revisions
> return map(self.get_revision, revision_ids)
> File "/home/denys/.bazaar/plugins/svn/repository.py", line 987, in get_revision
> revmeta, mapping = self._get_revmeta(revision_id)
> File "/home/denys/.bazaar/plugins/svn/repository.py", line 978, in _get_revmeta
> (uuid, branch, revnum), mapping = self.lookup_bzr_revision_id(revision_id)
> File "/home/denys/.bazaar/plugins/svn/repository.py", line 1062, in lookup_bzr_revision_id
> return self.revmap.get_branch_revnum(revid, layout, project)
> File "/home/denys/.bazaar/plugins/svn/revids.py", line 249, in get_branch_revnum
> raise e
> NoSuchRevision: <bzrlib.plugins.svn.cache.tdbcache.TdbRevisionIdMapCache object at 0x9a81bcc> has no revision 1
Are you running "bzr log" in the subversion checkout ? What's the full
command you're running?

status incomplete

Cheers,

Jelmer

On Sat, 2011-03-12 at 19:53 +0000, Denys Duchier wrote:
> Public bug reported:
> 
> I "bzr branch'ed" off a bzr/svn branch, make a mod and a commit, then merged it back into the bzr/svn branch.
> now "bzr log" bombs when I want to see merges.
> 
> bzr: ERROR: bzrlib.errors.NoSuchRevision:
> <bzrlib.plugins.svn.cache.tdbcache.TdbRevisionIdMapCache object at
> 0x9a81bcc> has no revision 1
> 
> Traceback (most recent call last):
>   File "/home/denys/lib/python/bzrlib/commands.py", line 926, in exception_to_return_code
>     return the_callable(*args, **kwargs)
>   File "/home/denys/lib/python/bzrlib/commands.py", line 1126, in run_bzr
>     ret = run(*run_argv)
>   File "/home/denys/lib/python/bzrlib/commands.py", line 691, in run_argv_aliases
>     return self.run(**all_cmd_args)
>   File "/home/denys/lib/python/bzrlib/commands.py", line 713, in run
>     return self._operation.run_simple(*args, **kwargs)
>   File "/home/denys/lib/python/bzrlib/cleanup.py", line 135, in run_simple
>     self.cleanups, self.func, *args, **kwargs)
>   File "/home/denys/lib/python/bzrlib/cleanup.py", line 165, in _do_with_cleanups
>     result = func(*args, **kwargs)
>   File "/home/denys/lib/python/bzrlib/commands.py", line 1141, in ignore_pipe
>     result = func(*args, **kwargs)
>   File "/home/denys/lib/python/bzrlib/builtins.py", line 2511, in run
>     Logger(b, rqst).show(lf)
>   File "/home/denys/lib/python/bzrlib/log.py", line 343, in show
>     self._show_body(lf)
>   File "/home/denys/lib/python/bzrlib/log.py", line 367, in _show_body
>     for lr in generator.iter_log_revisions():
>   File "/home/denys/lib/python/bzrlib/log.py", line 405, in iter_log_revisions
>     for revs in revision_iterator:
>   File "/home/denys/lib/python/bzrlib/log.py", line 933, in _make_revision_objects
>     revisions = repository.get_revisions(revision_ids)
>   File "/home/denys/.bazaar/plugins/svn/repository.py", line 994, in get_revisions
>     return map(self.get_revision, revision_ids)
>   File "/home/denys/.bazaar/plugins/svn/repository.py", line 987, in get_revision
>     revmeta, mapping = self._get_revmeta(revision_id)
>   File "/home/denys/.bazaar/plugins/svn/repository.py", line 978, in _get_revmeta
>     (uuid, branch, revnum), mapping = self.lookup_bzr_revision_id(revision_id)
>   File "/home/denys/.bazaar/plugins/svn/repository.py", line 1062, in lookup_bzr_revision_id
>     return self.revmap.get_branch_revnum(revid, layout, project)
>   File "/home/denys/.bazaar/plugins/svn/revids.py", line 249, in get_branch_revnum
>     raise e
> NoSuchRevision: <bzrlib.plugins.svn.cache.tdbcache.TdbRevisionIdMapCache object at 0x9a81bcc> has no revision 1
Are you running "bzr log" in the subversion checkout ?  What's the full
command you're running?

status incomplete

Cheers,

Jelmer

Changed in bzr-svn:
status:	New → Incomplete

Revision history for this message

Denys Duchier (denys.duchier) wrote on 2011-03-12:

#2

Download full text (4.2 KiB)

yes, I run "bzr log --include-merges" in the svn checkout and here the full transcript of the error:

bzr: ERROR: bzrlib.errors.NoSuchRevision: <bzrlib.plugins.svn.cache.tdbcache.TdbRevisionIdMapCache object at 0x9a02bcc> has no revision 1

Traceback (most recent call last):
  File "/home/denys/lib/python/bzrlib/commands.py", line 926, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/home/denys/lib/python/bzrlib/commands.py", line 1126, in run_bzr
    ret = run(*run_argv)
  File "/home/denys/lib/python/bzrlib/commands.py", line 691, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/home/denys/lib/python/bzrlib/commands.py", line 713, in run
    return self._operation.run_simple(*args, **kwargs)
  File "/home/denys/lib/python/bzrlib/cleanup.py", line 135, in run_simple
    self.cleanups, self.func, *args, **kwargs)
  File "/home/denys/lib/python/bzrlib/cleanup.py", line 165, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/home/denys/lib/python/bzrlib/commands.py", line 1141, in ignore_pipe
    result = func(*args, **kwargs)
  File "/home/denys/lib/python/bzrlib/builtins.py", line 2511, in run
    Logger(b, rqst).show(lf)
  File "/home/denys/lib/python/bzrlib/log.py", line 343, in show
    self._show_body(lf)
  File "/home/denys/lib/python/bzrlib/log.py", line 367, in _show_body
    for lr in generator.iter_log_revisions():
  File "/home/denys/lib/python/bzrlib/log.py", line 405, in iter_log_revisions
    for revs in revision_iterator:
  File "/home/denys/lib/python/bzrlib/log.py", line 933, in _make_revision_objects
    revisions = repository.get_revisions(revision_ids)
  File "/home/denys/.bazaar/plugins/svn/repository.py", line 994, in get_revisions
    return map(self.get_revision, revision_ids)
  File "/home/denys/.bazaar/plugins/svn/repository.py", line 987, in get_revision
    revmeta, mapping = self._get_revmeta(revision_id)
  File "/home/denys/.bazaar/plugins/svn/repository.py", line 978, in _get_revmeta
    (uuid, branch, revnum), mapping = self.lookup_bzr_revision_id(revision_id)
  File "/home/denys/.bazaar/plugins/svn/repository.py", line 1062, in lookup_bzr_revision_id
    return self.revmap.get_branch_revnum(revid, layout, project)
  File "/home/denys/.bazaar/plugins/svn/revids.py", line 249, in get_branch_revnum
    raise e
NoSuchRevision: <bzrlib.plugins.svn.cache.tdbcache.TdbRevisionIdMapCache object at 0x9a02bcc> has no revision 1

bzr 2.4.0dev1 on python 2.7.1 (Linux-2.6.37-gentoo-r1-i686-Intel-R-_Core-TM-2_Duo_CPU_T8100_@_2.10GHz-with-gentoo-2.0.1)
arguments: ['/home/denys/bin/bzr', 'log', '--include-merges']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'en_US.utf8'
plugins:
bash_completion 2.4.0dev1
Generate a shell function for bash command line completion.
/home/denys/lib/python/bzrlib/plugins/bash_completion

difftools 0.91.0
External diff tools plugin for Bazaar
/home/denys/.bazaar/plugins/difftools

explorer 1.1.0dev
Version Control for Human Beings.
/home/denys/.bazaar/plugins/explorer

extmerge
external merge plugin for bzr
/home/denys/.bazaar/plugins/extmerge

fastimport 0.11.0dev
FastImport Plugin
/home/denys/.bazaar/plugins/fastimpo...

yes, I run "bzr log --include-merges" in the svn checkout and here the full transcript of the error:

bzr: ERROR: bzrlib.errors.NoSuchRevision: <bzrlib.plugins.svn.cache.tdbcache.TdbRevisionIdMapCache object at 0x9a02bcc> has no revision 1

Traceback (most recent call last):
  File "/home/denys/lib/python/bzrlib/commands.py", line 926, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/home/denys/lib/python/bzrlib/commands.py", line 1126, in run_bzr
    ret = run(*run_argv)
  File "/home/denys/lib/python/bzrlib/commands.py", line 691, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/home/denys/lib/python/bzrlib/commands.py", line 713, in run
    return self._operation.run_simple(*args, **kwargs)
  File "/home/denys/lib/python/bzrlib/cleanup.py", line 135, in run_simple
    self.cleanups, self.func, *args, **kwargs)
  File "/home/denys/lib/python/bzrlib/cleanup.py", line 165, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/home/denys/lib/python/bzrlib/commands.py", line 1141, in ignore_pipe
    result = func(*args, **kwargs)
  File "/home/denys/lib/python/bzrlib/builtins.py", line 2511, in run
    Logger(b, rqst).show(lf)
  File "/home/denys/lib/python/bzrlib/log.py", line 343, in show
    self._show_body(lf)
  File "/home/denys/lib/python/bzrlib/log.py", line 367, in _show_body
    for lr in generator.iter_log_revisions():
  File "/home/denys/lib/python/bzrlib/log.py", line 405, in iter_log_revisions
    for revs in revision_iterator:
  File "/home/denys/lib/python/bzrlib/log.py", line 933, in _make_revision_objects
    revisions = repository.get_revisions(revision_ids)
  File "/home/denys/.bazaar/plugins/svn/repository.py", line 994, in get_revisions
    return map(self.get_revision, revision_ids)
  File "/home/denys/.bazaar/plugins/svn/repository.py", line 987, in get_revision
    revmeta, mapping = self._get_revmeta(revision_id)
  File "/home/denys/.bazaar/plugins/svn/repository.py", line 978, in _get_revmeta
    (uuid, branch, revnum), mapping = self.lookup_bzr_revision_id(revision_id)
  File "/home/denys/.bazaar/plugins/svn/repository.py", line 1062, in lookup_bzr_revision_id
    return self.revmap.get_branch_revnum(revid, layout, project)
  File "/home/denys/.bazaar/plugins/svn/revids.py", line 249, in get_branch_revnum
    raise e
NoSuchRevision: <bzrlib.plugins.svn.cache.tdbcache.TdbRevisionIdMapCache object at 0x9a02bcc> has no revision 1

bzr 2.4.0dev1 on python 2.7.1 (Linux-2.6.37-gentoo-r1-i686-Intel-R-_Core-TM-2_Duo_CPU_T8100_@_2.10GHz-with-gentoo-2.0.1)
arguments: ['/home/denys/bin/bzr', 'log', '--include-merges']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'en_US.utf8'
plugins:
bash_completion 2.4.0dev1
  Generate a shell function for bash command line completion.
   /home/denys/lib/python/bzrlib/plugins/bash_completion

difftools 0.91.0
  External diff tools plugin for Bazaar
   /home/denys/.bazaar/plugins/difftools

explorer 1.1.0dev
  Version Control for Human Beings.
   /home/denys/.bazaar/plugins/explorer

extmerge 
  external merge plugin for bzr
   /home/denys/.bazaar/plugins/extmerge

fastimport 0.11.0dev
  FastImport Plugin
   /home/denys/.bazaar/plugins/fastimport

launchpad 2.4.0dev1
  Launchpad.net integration plugin for Bazaar.
   /home/denys/lib/python/bzrlib/plugins/launchpad

loom 1.4.0dev
  Loom is a bzr plugin which adds new commands to manage a loom of patches.
   /home/denys/.bazaar/plugins/loom

netrc_credential_store 2.4.0dev1
  Use ~/.netrc as a credential store for authentication.conf.
   /home/denys/lib/python/bzrlib/plugins/netrc_credential_store

news_merge 2.4.0dev1
  Merge hook for bzr's NEWS file.
   /home/denys/lib/python/bzrlib/plugins/news_merge

qbzr 0.19.0dev1
  QBzr - Qt-based frontend for Bazaar
   /home/denys/.bazaar/plugins/qbzr

search 1.7.0dev
  search is a bzr plugin for searching bzr content.
   /home/denys/.bazaar/plugins/search

svn 1.1.0dev
  Support for Subversion branches
   /home/denys/.bazaar/plugins/svn

*** Bazaar has encountered an internal error.  This probably indicates a
    bug in Bazaar.  You can help us fix it by filing a bug report at
        https://bugs.launchpad.net/bzr/+filebug
    including this traceback and a description of the problem.

Jelmer Vernooij (jelmer) on 2011-03-25

Changed in bzr-svn:
status:	Incomplete → Triaged
affects:	bzr-svn → bzr
Changed in bzr:
importance:	Undecided → Medium
status:	Triaged → Confirmed
tags:	added: ghost
tags:	added: log

Revision history for this message

Jelmer Vernooij (jelmer) wrote on 2017-06-22:

#3

This is fixed as part of lp:~jelmer/brz/mainline-ghost

Changed in brz:
status:	New → Fix Released
importance:	Undecided → Low
assignee:	nobody → Jelmer Vernooij (jelmer)
milestone:	none → 3.0.0

Affects		Status	Importance	Assigned to	Milestone
	Bazaar	Confirmed	Medium	Unassigned
	Breezy	Fix Released	Low	Jelmer Vernooij	Breezy 3.0.0 "Pelican"

Bazaar

bzr log --include-merges bombs

Bug Description

Other bug subscribers

Remote bug watches