On 04/21/12 11:09, Paul wrote:
On Friday, 20 April, 2012 at 20:57:55 BST, Tim Chase wrote:
" 1) diff against a previous revision of the file
:diffpatch !svn diff -r1234 %
For this, I'd use vcscommand
(http://www.vim.org/scripts/script.php?script_id=90) like this:
:VCSVimDiff 1234
Just installed vcscommand and am hitting some strange errors when
I issue "VCSBlame" in my git repo. Based on what I see in the
(literally) screen full of red/error text (dumped below), it
looks like it's trying to use bzr instead of git on my file.
(for the record, VCSVimDiff does work fine). I didn't see
anything in the vcscommand docs on how it detects the repo type.
-tim
VCSCommand: Version control command failed: bzr: ERROR:
exceptions.NotImplementedError: <bound method
GitTexts.get_parent_map of
<bzrlib.plugins.git.versionedfiles.GitTexts object at 0x2274b50
>> Traceback (most recent call last): File
"/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 853,
in exception_to_return_code return the_callable(*args,
**kwargs) File "/
usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 1055,
in run_bzr ret = run(*run_argv) File
"/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 661,
in run_argv_aliases
return self.run_direct(**all_cmd_args) File
"/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 665,
in run_direct return self._operation.run_simple(*args,
**kwargs) File
"/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 122,
in run_simple self.cleanups, self.func, *args, **kwargs)
File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line
156, in _do_with_cleanups result = func(*args, **kwargs)
File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line
1070, in ignore_pipe result = func(*args, **kwargs) File
"/usr/lib/python2.6/dist-packages/bzrlib/builtins.py", line
4521, in run show_ids=show_ids) File
"/usr/lib/python2.6/dist-packages/bzrlib/annotate.py", line 89,
in annotate_file_tree
annotations = list(tree.annotate_iter(file_id)) File
"/usr/lib/python2.6/dist-packages/bzrlib/decorators.py", line
140, in read_locked result = unbound(self, *args, **kwargs)
File
"/usr/lib/python2.6/dist-packages/bzrlib/workingtree.py", line
524, in annotate_iter for key, line in
annotator.annotate_flat(this_key)] File "_annotator_pyx.pyx",
line 275, in bzrlib._a
nnotator_pyx.Annotator.annotate_flat File
"/usr/lib/python2.6/dist-packages/bzrlib/_annotator_py.py", line
258, in annotate for text_key, text, num_lines in
self._get_needed_texts(key, p
b=pb): File
"/usr/lib/python2.6/dist-packages/bzrlib/_annotator_py.py", line
110, in _get_needed_texts keys, ann_keys =
self._get_needed_keys(key) File "/usr/lib/python2.6/dist-packag
es/bzrlib/_annotator_py.py", line 87, in _get_needed_keys
next_parent_map.update(self._vf.get_parent_map(parent_lookup))
File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/git/version
edfiles.py", line 123, in get_parent_map raise
NotImplementedError(self.get_parent_map) NotImplementedError:
<bound method GitTexts.get_parent_map of
<bzrlib.plugins.git.versionedfiles.Git
Texts object at 0x2274b50>> bzr 2.1.2 on python 2.6.6
(Linux-2.6.39-bpo.2-amd64-x86_64-with-debian-6.0.4) arguments:
['/usr/bin/bzr', 'blame', '--', 'pymail.py'] encoding:
'ANSI_X3.4-1968',
fsenc: 'ANSI_X3.4-1968', lang: 'C' plugins: bzrtools
/usr/lib/python2.6/dist-packages/bzrlib/plugins/bzrtools
[2.1.0] dbus /usr/lib/python2.6/dist-packages/bz
rlib/plugins/dbus [0.1.0dev] email
/usr/lib/python2.6/dist-packages/bzrlib/plugins/email [unknown]
git
/usr/lib/python2.6/dist-packages/bzrlib/plugins/git [
0.5.2] grep
/usr/lib/python2.6/dist-packages/bzrlib/plugins/grep [0.4.0]
gtk
/usr/lib/python2.6/dist-packages/bzrlib/plugins/gtk [0.99.0dev1]
hg
/usr/lib/python2.6/dist-packages/bzrlib/plugins/hg
[0.2.0dev] launchpad
/usr/lib/python2.6/dist-packages/bzrlib/plugins/launchpad [2.1.2]
netrc_credential_store /usr/
lib/python2.6/dist-packages/bzrlib/plugins/netrc_credential_store
[2.1.2] news_merge
/usr/lib/python2.6/dist-packages/bzrlib/plugins/news_merge
[2.1.2] rewrite /usr/
lib/python2.6/dist-packages/bzrlib/plugins/rewrite [0.6.0]
search
/usr/lib/python2.6/dist-packages/bzrlib/plugins/search [1.7.0dev]
stats /usr/lib/python2.6/di
st-packages/bzrlib/plugins/stats [0.1.0dev] svn
/usr/lib/python2.6/dist-packages/bzrlib/plugins/svn [1.0.3]
*** Bazaar has encountered an internal error. This probably in
dicates 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.
--
You received this message from the "vim_use" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
