Merge lp:~anj/bzr-keywords/handle-exceptions into lp:bzr-keywords

[Andrew Johnson]

Various repository operations (e.g. rebasing or of merging two branches where one has deleted files in it) can generate exceptions during keyword expansion which prevent the operation from working. This branch adds code to handle those exceptions and thus permit the merge to complete normally.

I haven't checked whether this resolves bug #697260, but it might.

[Jelmer Vernooij (jelmer)]

It seems a bit strange to catch NotImplementedError here - that should never occur here. When did you hit this?

[Andrew Johnson (anj)]

It's quite a while since I developed this patch and I don't remember the details of that one now, so it's possible that catch is not actually needed. The other one definitely is though, I can provide .bzr.log file entries for crashes that generated that.

[Andrew Johnson (anj)]

I lied, my home machine has that error logged:

Mon 2010-10-04 00:16:56 -0500
0.049 bazaar version: 2.1.1
0.049 bzr arguments: [u'unshelve']
0.066 looking for plugins in /home/anj/.bazaar/plugins
0.144 looking for plugins in /usr/lib/python2.6/dist-packages/bzrlib/plugins
0.145 Plugin name bzrtools already loaded
0.187 encoding stdout as sys.stdout encoding 'UTF-8'
0.255 opening working tree '/home/anj/Software/epics/mirror-3.14'
[ 3635] 2010-10-04 00:16:56.601 INFO: Using changes with id "1".
1.594 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/builtins.py", line 5820, in run
    unshelver.run()
  File "/usr/lib/python2.6/dist-packages/bzrlib/shelf_ui.py", line 479, in run
    merger.do_merge()
  File "/usr/lib/python2.6/dist-packages/bzrlib/merge.py", line 658, in do_merge
    merge = operation.run_simple()
  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/merge.py", line 629, in _do_merge_to
    merge.do_merge()
  File "/usr/lib/python2.6/dist-packages/bzrlib/merge.py", line 766, in do_merge
    operation.run()
  File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 118, in run
    self.cleanups, self.func, self, *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/merge.py", line 772, in _do_merge
    self._compute_transform()
  File "/usr/lib/python2.6/dist-packages/bzrlib/merge.py", line 814, in _compute_transform
    file_status = self._do_merge_contents(file_id)
  File "/usr/lib/python2.6/dist-packages/bzrlib/merge.py", line 1302, in _do_merge_contents
    hook_status, lines = hook.merge_contents(params)
  File "/usr/lib/python2.6/dist-packages/bzrlib/merge.py", line 1386, in merge_contents
    return self._default_other_winner_merge(merge_hook_params)
  File "/usr/lib/python2.6/dist-packages/bzrlib/merge.py", line 1369, in _default_other_winner_merge
    filter_tree_path=filter_tree_path)
  File "/usr/lib/python2.6/dist-packages/bzrlib/transform.py", line 2534, in create_from_tree
    ContentFilterContext(filter_tree_path,...

[Jelmer Vernooij (jelmer)]

This looks alright. It would be great to have a test for this which reproduces the problematic situation this is supposed to handle.

review: Needs Fixing

[lp:~anj/bzr-keywords/handle-exceptions]

21. By Andrew Johnson on 2015-05-14

Merged changes from official branch

Unmerged revisions

21. By Andrew Johnson on 2015-05-14

Merged changes from official branch

20. By Andrew Johnson on 2011-08-18

Handle various exceptions during keyword processing.

These tend to occur during merges or rebasing, when
one side or other has delted files in the tree.

=== modified file 'keywords.py'
--- keywords.py	2011-03-02 12:31:59 +0000
+++ keywords.py	2015-05-14 16:58:38 +0000
@@ -17,6 +17,7 @@
 import re, time
 from bzrlib import (
     debug,
+    errors,
     osutils,
     registry,
     trace,
@@ -204,7 +205,17 @@
                 if 'error' in debug.debug_flags:
                     trace.note("error evaluating %s for keyword %s: %s",
                         expansion, keyword, err)
-                expansion = "(evaluation error)"
+                expansion = None
+            except NotImplementedError, err:
+                if 'error' in debug.debug_flags:
+                    trace.note("Can't evaluate %s for keyword %s: %s",
+                        expansion, keyword, err)
+                expansion = None
+            except errors.NoSuchId, err:
+                if 'error' in debug.debug_flags:
+                    trace.note("Can't evaluate %s for keyword %s: %s",
+                        expansion, keyword, err)
+                expansion = None
         if expansion is None:
             # Unknown expansion - leave as is
             result += match.group(0)