Merge into trunk : fix-deprecated-split-lp-911999 : Code : Bazaar Externals plugin

Status:

Merged

Merged at revision:

49

Proposed branch:

lp://staging/~florian-rathgeber/bzr-externals/fix-deprecated-split-lp-911999

Merge into:

lp://staging/bzr-externals

Diff against target:

24 lines (+4/-3)

1 file modified

externals.py (+4/-3)

To merge this branch:

bzr merge lp://staging/~florian-rathgeber/bzr-externals/fix-deprecated-split-lp-911999

Undecided

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Eugene Tarasenko		2012-01-04	Needs Fixing on 2012-01-10
Review via email: mp+87540@code.staging.launchpad.net

Description of the change

The 'shlex_split_unicode' method in 'bzrlib.commands' used in bzr-externals is deprecated as of bzr 2.2.0 and has been removed in the recent development version of bzr, causing the plugin to crash with:

bzr: ERROR: exceptions.ImportError: cannot import name shlex_split_unicode

This is a simple fix: replace 'shlex_split_unicode' with 'cmdline.split' (also from 'bzrlib.commands').

Revision history for this message

Eugene Tarasenko (etarasenko) wrote on 2012-01-10:

#

Download full text (5.0 KiB)

$ bzr init main
Created a standalone tree (format: 2a)
$ bzr init sub1
Created a standalone tree (format: 2a)
$ cd main/
$ bzr eadd ../sub1 sub1
Add external branch ../sub1 sub1
Branched 0 revision(s).
adding .bzrignore
adding .bzrmeta
adding .bzrmeta/externals
adding .bzrmeta/externals-snapshot

$ bzr ci -m "Add sub1"
Committing to: /home/etarasenko/projects/bzr-externals/main/
added .bzrignore
added .bzrmeta
added .bzrmeta/externals
added .bzrmeta/externals-snapshot
bzr: ERROR: bzrlib.errors.IllegalUseOfScopeReplacer: ScopeReplacer object 'cmdline' was used incorrectly: Object already cleaned up, did you assign it to another variable?: _factory

Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 946, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 1150, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 699, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 721, in run
    return self._operation.run_simple(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 135, in run_simple
    self.cleanups, self.func, *args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 165, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/builtins.py", line 3316, in run
    lossy=lossy)
  File "/usr/lib/python2.7/dist-packages/bzrlib/decorators.py", line 217, in write_locked
    result = unbound(self, *args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/workingtree_4.py", line 209, in commit
    result = WorkingTree.commit(self, message, revprops, *args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/decorators.py", line 217, in write_locked
    result = unbound(self, *args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/mutabletree.py", line 210, in commit
    *args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/commit.py", line 289, in commit
    lossy=lossy)
  File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 131, in run
    self.cleanups, self.func, self, *args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 165, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/commit.py", line 462, in _commit
    self.branch.set_last_revision_info(new_revno, self.rev_id)
  File "/usr/lib/python2.7/dist-packages/bzrlib/decorators.py", line 217, in w...

$ bzr init main
Created a standalone tree (format: 2a)                                                                                                                                      
$ bzr init sub1
Created a standalone tree (format: 2a)                                                                                                                                      
$ cd main/
$ bzr eadd ../sub1 sub1
Add external branch ../sub1 sub1
Branched 0 revision(s).                                                                                                                                                     
adding .bzrignore
adding .bzrmeta
adding .bzrmeta/externals
adding .bzrmeta/externals-snapshot

$ bzr ci -m "Add sub1"
Committing to: /home/etarasenko/projects/bzr-externals/main/                                                                                                                
added .bzrignore
added .bzrmeta
added .bzrmeta/externals
added .bzrmeta/externals-snapshot
bzr: ERROR: bzrlib.errors.IllegalUseOfScopeReplacer: ScopeReplacer object 'cmdline' was used incorrectly: Object already cleaned up, did you assign it to another variable?: _factory

Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 946, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 1150, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 699, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 721, in run
    return self._operation.run_simple(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 135, in run_simple
    self.cleanups, self.func, *args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 165, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/builtins.py", line 3316, in run
    lossy=lossy)
  File "/usr/lib/python2.7/dist-packages/bzrlib/decorators.py", line 217, in write_locked
    result = unbound(self, *args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/workingtree_4.py", line 209, in commit
    result = WorkingTree.commit(self, message, revprops, *args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/decorators.py", line 217, in write_locked
    result = unbound(self, *args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/mutabletree.py", line 210, in commit
    *args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/commit.py", line 289, in commit
    lossy=lossy)
  File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 131, in run
    self.cleanups, self.func, self, *args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 165, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/commit.py", line 462, in _commit
    self.branch.set_last_revision_info(new_revno, self.rev_id)
  File "/usr/lib/python2.7/dist-packages/bzrlib/decorators.py", line 217, in write_locked
    result = unbound(self, *args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/branch.py", line 2521, in set_last_revision_info
    self._run_post_change_branch_tip_hooks(old_revno, old_revid)
  File "/usr/lib/python2.7/dist-packages/bzrlib/branch.py", line 1221, in _run_post_change_branch_tip_hooks
    hook(params)
  File "/home/etarasenko/.bazaar/plugins/externals/__init__.py", line 75, in post_change_branch_tip_hook
    lazy_externals.Externals(params.branch, params.new_revid).pull()
  File "/home/etarasenko/.bazaar/plugins/externals/externals.py", line 157, in pull
    self.read_config()
  File "/home/etarasenko/.bazaar/plugins/externals/externals.py", line 61, in read_config
    self._set_config(f.read())
  File "/home/etarasenko/.bazaar/plugins/externals/externals.py", line 50, in _set_config
    arg = cmdline.split(line)
  File "/usr/lib/python2.7/dist-packages/bzrlib/lazy_import.py", line 110, in __getattribute__
    obj = _replace()
  File "/usr/lib/python2.7/dist-packages/bzrlib/lazy_import.py", line 89, in _replace
    extra=e)
IllegalUseOfScopeReplacer: ScopeReplacer object 'cmdline' was used incorrectly: Object already cleaned up, did you assign it to another variable?: _factory

bzr 2.4.1 on python 2.7.2 (Linux-3.0.0-12-generic-i686-with-LinuxMint-12-lisa)
arguments: ['/usr/bin/bzr', 'ci', '-m', 'Add sub1']
plugins: bash_completion[2.4.1], bzrtools[2.4.0], changelog_merge[2.4.1],
    externals[1.3.2], launchpad[2.4.1], netrc_credential_store[2.4.1],
    news_merge[2.4.1], qbzr[0.21.1], weave_fmt[2.4.1]
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'ru_RU.UTF-8'

*** 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.

review: Needs Fixing

lp://staging/~florian-rathgeber/bzr-externals/fix-deprecated-split-lp-911999 updated on 2012-01-20

50. By Florian Rathgeber on 2012-01-20: Directly import split from bzrlib.cmdline to properly work with lazy_import.

Bazaar Externals plugin

Merge lp://staging/~florian-rathgeber/bzr-externals/fix-deprecated-split-lp-911999 into lp://staging/bzr-externals

Commit message

Description of the change

Preview Diff

Subscribers