/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz
10 by Scott James Remnant
Add an extra window type, clicking the little icons next to a parent
1
"""Difference window.
2
3
This module contains the code to manage the diff window which shows
4
the changes made between two revisions on a branch.
5
"""
6
613.1.1 by Vincent Ladeuil
Fix bug #286834 bu handling 'missing' files corner case.
7
__copyright__ = "Copyright 2005 Canonical Ltd."
771.1.7 by Curtis Hovey
PEP8 changes.
8
__author__ = "Scott James Remnant <scott@ubuntu.com>"
10 by Scott James Remnant
Add an extra window type, clicking the little icons next to a parent
9
10
11
from cStringIO import StringIO
12
232.1.1 by Adeodato Simó
Read ~/.colordiffrc to set colors in the diff window.
13
import os
14
import re
76 by Jelmer Vernooij
Replace non-UTF8 characters rather than generating an exception (fixes #44677).
15
import sys
688.3.1 by Toshio Kuratomi
Fix bzr-handle-patch to process patches with leading and trailing comments with
16
import inspect
666.1.1 by Pelle Johansson
find ElementTree in python 2.4
17
try:
771.1.7 by Curtis Hovey
PEP8 changes.
18
    from xml.etree.ElementTree import (
19
        Element,
20
        SubElement,
21
        tostring,
22
        )
23
    Element, SubElement, tostring  # Hush PEP8 redefinition.
667 by Jelmer Vernooij
Merge fix to allow finding elementtree on python2.4.
24
except ImportError:
771.1.7 by Curtis Hovey
PEP8 changes.
25
    from elementtree.ElementTree import (
26
        Element,
27
        SubElement,
28
        tostring,
29
        )
10 by Scott James Remnant
Add an extra window type, clicking the little icons next to a parent
30
771.1.7 by Curtis Hovey
PEP8 changes.
31
from gi.repository import Gtk
32
from gi.repository import Pango
10 by Scott James Remnant
Add an extra window type, clicking the little icons next to a parent
33
try:
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
34
    from gi.repository import GtkSource
10 by Scott James Remnant
Add an extra window type, clicking the little icons next to a parent
35
    have_gtksourceview = True
36
except ImportError:
37
    have_gtksourceview = False
232.1.3 by Adeodato Simó
Support setting diff colors from gedit's syntax highlighting config too.
38
try:
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
39
    from gi.repository import GConf
232.1.3 by Adeodato Simó
Support setting diff colors from gedit's syntax highlighting config too.
40
    have_gconf = True
41
except ImportError:
42
    have_gconf = False
10 by Scott James Remnant
Add an extra window type, clicking the little icons next to a parent
43
434 by Aaron Bentley
Better errors, merge directive saving
44
from bzrlib import (
677 by Vincent Ladeuil
Fix 2.1.0 compatibility issue.
45
    errors,
434 by Aaron Bentley
Better errors, merge directive saving
46
    merge as _mod_merge,
47
    osutils,
48
    urlutils,
49
    workingtree,
771.1.7 by Curtis Hovey
PEP8 changes.
50
    )
724 by Jelmer Vernooij
Fix formatting, imports.
51
from bzrlib.diff import show_diff_trees
426 by Aaron Bentley
Start support for Merge Directives
52
from bzrlib.patches import parse_patches
232.1.1 by Adeodato Simó
Read ~/.colordiffrc to set colors in the diff window.
53
from bzrlib.trace import warning
724 by Jelmer Vernooij
Fix formatting, imports.
54
from bzrlib.plugins.gtk.dialog import (
55
    error_dialog,
56
    info_dialog,
57
    warning_dialog,
58
    )
729.1.1 by Jelmer Vernooij
Move i18n support to a separate file, so gettext files aren't loaded unless bzr-gtk is used.
59
from bzrlib.plugins.gtk.i18n import _i18n
60
from bzrlib.plugins.gtk.window import Window
428 by Aaron Bentley
Get merging working
61
62
657 by Jelmer Vernooij
Merge replacement for guess_language with small tweak: use the canonical implementation if we can.
63
def fallback_guess_language(slm, content_type):
64
    for lang_id in slm.get_language_ids():
65
        lang = slm.get_language(lang_id)
66
        if "text/x-patch" in lang.get_mime_types():
67
            return lang
68
    return None
69
70
428 by Aaron Bentley
Get merging working
71
class SelectCancelled(Exception):
72
73
    pass
298.2.1 by Daniel Schierbeck
Refactored the GTK window code, creating a single base window class that handles keyboard events.
74
10 by Scott James Remnant
Add an extra window type, clicking the little icons next to a parent
75
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
76
class DiffFileView(Gtk.ScrolledWindow):
432 by Aaron Bentley
Misc updates
77
    """Window for displaying diffs from a diff file"""
10 by Scott James Remnant
Add an extra window type, clicking the little icons next to a parent
78
51 by Jelmer Vernooij
Rework some of the parameters to DiffWindow.set_diff() to be
79
    def __init__(self):
734.1.51 by Curtis Hovey
Fix the initializer for many classes.
80
        super(DiffFileView, self).__init__()
10 by Scott James Remnant
Add an extra window type, clicking the little icons next to a parent
81
        self.construct()
424 by Aaron Bentley
Add ghandle-patch
82
        self._diffs = {}
10 by Scott James Remnant
Add an extra window type, clicking the little icons next to a parent
83
84
    def construct(self):
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
85
        self.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
86
        self.set_shadow_type(Gtk.ShadowType.IN)
10 by Scott James Remnant
Add an extra window type, clicking the little icons next to a parent
87
88
        if have_gtksourceview:
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
89
            self.buffer = GtkSource.Buffer()
734.1.3 by Curtis Hovey
Update diff to gtk3.
90
            lang_manager = GtkSource.LanguageManager.get_default()
91
            language = lang_manager.guess_language(None, "text/x-patch")
232.1.3 by Adeodato Simó
Support setting diff colors from gedit's syntax highlighting config too.
92
            if have_gconf:
635.3.2 by Szilveszter Farkas
Support gedit color schemes for gtksourceview2.
93
                self.apply_gedit_colors(self.buffer)
635.3.3 by Szilveszter Farkas
Made apply_colordiff_colors() work with gtksourceview2.
94
            self.apply_colordiff_colors(self.buffer)
734.1.3 by Curtis Hovey
Update diff to gtk3.
95
            self.buffer.set_language(language)
635.3.2 by Szilveszter Farkas
Support gedit color schemes for gtksourceview2.
96
            self.buffer.set_highlight_syntax(True)
10 by Scott James Remnant
Add an extra window type, clicking the little icons next to a parent
97
734.1.3 by Curtis Hovey
Update diff to gtk3.
98
            self.sourceview = GtkSource.View(buffer=self.buffer)
10 by Scott James Remnant
Add an extra window type, clicking the little icons next to a parent
99
        else:
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
100
            self.buffer = Gtk.TextBuffer()
101
            self.sourceview = Gtk.TextView(self.buffer)
10 by Scott James Remnant
Add an extra window type, clicking the little icons next to a parent
102
555.2.1 by Jasper Groenewegen
Modify DiffWidget to include a checkbutton to wrap long lines in the diff view
103
        self.sourceview.set_editable(False)
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
104
        self.sourceview.modify_font(Pango.FontDescription("Monospace"))
555.2.1 by Jasper Groenewegen
Modify DiffWidget to include a checkbutton to wrap long lines in the diff view
105
        self.add(self.sourceview)
106
        self.sourceview.show()
10 by Scott James Remnant
Add an extra window type, clicking the little icons next to a parent
107
232.1.1 by Adeodato Simó
Read ~/.colordiffrc to set colors in the diff window.
108
    @staticmethod
635.3.2 by Szilveszter Farkas
Support gedit color schemes for gtksourceview2.
109
    def apply_gedit_colors(buf):
110
        """Set style to that specified in gedit configuration.
232.1.3 by Adeodato Simó
Support setting diff colors from gedit's syntax highlighting config too.
111
112
        This method needs the gconf module.
278.1.4 by John Arbash Meinel
Just playing around.
113
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
114
        :param buf: a GtkSource.Buffer object.
232.1.3 by Adeodato Simó
Support setting diff colors from gedit's syntax highlighting config too.
115
        """
635.3.2 by Szilveszter Farkas
Support gedit color schemes for gtksourceview2.
116
        GEDIT_SCHEME_PATH = '/apps/gedit-2/preferences/editor/colors/scheme'
699.1.1 by Edward Ari Bichetero
Show diff when user has custom GtkSourceView colour scheme. Credit to jras for figuring it out in https://bugs.launchpad.net/bzr-gtk/+bug/429947/comments/11
117
        GEDIT_USER_STYLES_PATH = os.path.expanduser('~/.gnome2/gedit/styles')
232.1.3 by Adeodato Simó
Support setting diff colors from gedit's syntax highlighting config too.
118
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
119
        client = GConf.Client.get_default()
635.3.2 by Szilveszter Farkas
Support gedit color schemes for gtksourceview2.
120
        style_scheme_name = client.get_string(GEDIT_SCHEME_PATH)
647 by Jelmer Vernooij
Skip setting gedit theme if it isn't set in gconf.
121
        if style_scheme_name is not None:
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
122
            style_scheme_mgr = GtkSource.StyleSchemeManager()
699.1.1 by Edward Ari Bichetero
Show diff when user has custom GtkSourceView colour scheme. Credit to jras for figuring it out in https://bugs.launchpad.net/bzr-gtk/+bug/429947/comments/11
123
            style_scheme_mgr.append_search_path(GEDIT_USER_STYLES_PATH)
771.1.7 by Curtis Hovey
PEP8 changes.
124
699.1.1 by Edward Ari Bichetero
Show diff when user has custom GtkSourceView colour scheme. Credit to jras for figuring it out in https://bugs.launchpad.net/bzr-gtk/+bug/429947/comments/11
125
            style_scheme = style_scheme_mgr.get_scheme(style_scheme_name)
771.1.7 by Curtis Hovey
PEP8 changes.
126
699.1.1 by Edward Ari Bichetero
Show diff when user has custom GtkSourceView colour scheme. Credit to jras for figuring it out in https://bugs.launchpad.net/bzr-gtk/+bug/429947/comments/11
127
            if style_scheme is not None:
128
                buf.set_style_scheme(style_scheme)
232.1.3 by Adeodato Simó
Support setting diff colors from gedit's syntax highlighting config too.
129
424 by Aaron Bentley
Add ghandle-patch
130
    @classmethod
635.3.3 by Szilveszter Farkas
Made apply_colordiff_colors() work with gtksourceview2.
131
    def apply_colordiff_colors(klass, buf):
232.1.2 by Adeodato Simó
Rename apply_colordiffrc to apply_colordiff_colors, improve docstring.
132
        """Set style colors for lang using the colordiff configuration file.
232.1.1 by Adeodato Simó
Read ~/.colordiffrc to set colors in the diff window.
133
134
        Both ~/.colordiffrc and ~/.colordiffrc.bzr-gtk are read.
135
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
136
        :param buf: a "Diff" GtkSource.Buffer object.
232.1.1 by Adeodato Simó
Read ~/.colordiffrc to set colors in the diff window.
137
        """
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
138
        scheme_manager = GtkSource.StyleSchemeManager()
635.3.3 by Szilveszter Farkas
Made apply_colordiff_colors() work with gtksourceview2.
139
        style_scheme = scheme_manager.get_scheme('colordiff')
771.1.7 by Curtis Hovey
PEP8 changes.
140
635.3.3 by Szilveszter Farkas
Made apply_colordiff_colors() work with gtksourceview2.
141
        # if style scheme not found, we'll generate it from colordiffrc
142
        # TODO: reload if colordiffrc has changed.
143
        if style_scheme is None:
144
            colors = {}
145
146
            for f in ('~/.colordiffrc', '~/.colordiffrc.bzr-gtk'):
147
                f = os.path.expanduser(f)
148
                if os.path.exists(f):
149
                    try:
150
                        f = file(f)
151
                    except IOError, e:
152
                        warning('could not open file %s: %s' % (f, str(e)))
153
                    else:
154
                        colors.update(klass.parse_colordiffrc(f))
155
                        f.close()
156
157
            if not colors:
158
                # ~/.colordiffrc does not exist
159
                return
771.1.7 by Curtis Hovey
PEP8 changes.
160
635.3.3 by Szilveszter Farkas
Made apply_colordiff_colors() work with gtksourceview2.
161
            mapping = {
162
                # map GtkSourceView2 scheme styles to colordiff names
232.1.1 by Adeodato Simó
Read ~/.colordiffrc to set colors in the diff window.
163
                # since GSV is richer, accept new names for extra bits,
164
                # defaulting to old names if they're not present
635.3.3 by Szilveszter Farkas
Made apply_colordiff_colors() work with gtksourceview2.
165
                'diff:added-line': ['newtext'],
166
                'diff:removed-line': ['oldtext'],
167
                'diff:location': ['location', 'diffstuff'],
168
                'diff:file': ['file', 'diffstuff'],
169
                'diff:special-case': ['specialcase', 'diffstuff'],
170
            }
771.1.7 by Curtis Hovey
PEP8 changes.
171
635.3.3 by Szilveszter Farkas
Made apply_colordiff_colors() work with gtksourceview2.
172
            converted_colors = {}
173
            for name, values in mapping.items():
174
                color = None
175
                for value in values:
176
                    color = colors.get(value, None)
177
                    if color is not None:
178
                        break
179
                if color is None:
180
                    continue
181
                converted_colors[name] = color
771.1.7 by Curtis Hovey
PEP8 changes.
182
635.3.3 by Szilveszter Farkas
Made apply_colordiff_colors() work with gtksourceview2.
183
            # some xml magic to produce needed style scheme description
184
            e_style_scheme = Element('style-scheme')
185
            e_style_scheme.set('id', 'colordiff')
186
            e_style_scheme.set('_name', 'ColorDiff')
187
            e_style_scheme.set('version', '1.0')
188
            for name, color in converted_colors.items():
189
                style = SubElement(e_style_scheme, 'style')
190
                style.set('name', name)
191
                style.set('foreground', '#%s' % color)
771.1.7 by Curtis Hovey
PEP8 changes.
192
635.3.3 by Szilveszter Farkas
Made apply_colordiff_colors() work with gtksourceview2.
193
            scheme_xml = tostring(e_style_scheme, 'UTF-8')
771.1.7 by Curtis Hovey
PEP8 changes.
194
            if not os.path.exists(os.path.expanduser(
195
                '~/.local/share/gtksourceview-2.0/styles')):
196
                os.makedirs(os.path.expanduser(
197
                    '~/.local/share/gtksourceview-2.0/styles'))
198
            file(os.path.expanduser(
199
                '~/.local/share/gtksourceview-2.0/styles/colordiff.xml'),
200
                'w').write(scheme_xml)
201
635.3.3 by Szilveszter Farkas
Made apply_colordiff_colors() work with gtksourceview2.
202
            scheme_manager.force_rescan()
203
            style_scheme = scheme_manager.get_scheme('colordiff')
771.1.7 by Curtis Hovey
PEP8 changes.
204
635.3.3 by Szilveszter Farkas
Made apply_colordiff_colors() work with gtksourceview2.
205
        buf.set_style_scheme(style_scheme)
232.1.4 by Adeodato Simó
Add a test for parse_colordiffrc, and fix the function to handle empty lines.
206
207
    @staticmethod
208
    def parse_colordiffrc(fileobj):
209
        """Parse fileobj as a colordiff configuration file.
278.1.4 by John Arbash Meinel
Just playing around.
210
232.1.4 by Adeodato Simó
Add a test for parse_colordiffrc, and fix the function to handle empty lines.
211
        :return: A dict with the key -> value pairs.
212
        """
213
        colors = {}
214
        for line in fileobj:
215
            if re.match(r'^\s*#', line):
216
                continue
217
            if '=' not in line:
218
                continue
219
            key, val = line.split('=', 1)
220
            colors[key.strip()] = val.strip()
221
        return colors
222
278.1.4 by John Arbash Meinel
Just playing around.
223
    def set_trees(self, rev_tree, parent_tree):
224
        self.rev_tree = rev_tree
225
        self.parent_tree = parent_tree
278.1.29 by John Arbash Meinel
Start testing with Unicode data.
226
#        self._build_delta()
227
228
#    def _build_delta(self):
229
#        self.parent_tree.lock_read()
230
#        self.rev_tree.lock_read()
231
#        try:
771.1.7 by Curtis Hovey
PEP8 changes.
232
#            self.delta = iter_changes_to_status(
233
#               self.parent_tree, self.rev_tree)
278.1.29 by John Arbash Meinel
Start testing with Unicode data.
234
#            self.path_to_status = {}
235
#            self.path_to_diff = {}
236
#            source_inv = self.parent_tree.inventory
237
#            target_inv = self.rev_tree.inventory
238
#            for (file_id, real_path, change_type, display_path) in self.delta:
771.1.7 by Curtis Hovey
PEP8 changes.
239
#                self.path_to_status[real_path] = u'=== %s %s' % (
240
#                    change_type, display_path)
278.1.29 by John Arbash Meinel
Start testing with Unicode data.
241
#                if change_type in ('modified', 'renamed and modified'):
242
#                    source_ie = source_inv[file_id]
243
#                    target_ie = target_inv[file_id]
244
#                    sio = StringIO()
245
#                    source_ie.diff(internal_diff, *old path, *old_tree,
246
#                                   *new_path, target_ie, self.rev_tree,
247
#                                   sio)
771.1.7 by Curtis Hovey
PEP8 changes.
248
#                    self.path_to_diff[real_path] =
278.1.29 by John Arbash Meinel
Start testing with Unicode data.
249
#
250
#        finally:
251
#            self.rev_tree.unlock()
252
#            self.parent_tree.unlock()
278.1.4 by John Arbash Meinel
Just playing around.
253
254
    def show_diff(self, specific_files):
426 by Aaron Bentley
Start support for Merge Directives
255
        sections = []
256
        if specific_files is None:
257
            self.buffer.set_text(self._diffs[None])
258
        else:
259
            for specific_file in specific_files:
260
                sections.append(self._diffs[specific_file])
261
            self.buffer.set_text(''.join(sections))
424 by Aaron Bentley
Add ghandle-patch
262
263
264
class DiffView(DiffFileView):
265
    """This is the soft and chewy filling for a DiffWindow."""
266
267
    def __init__(self):
734.1.51 by Curtis Hovey
Fix the initializer for many classes.
268
        super(DiffView, self).__init__()
424 by Aaron Bentley
Add ghandle-patch
269
        self.rev_tree = None
270
        self.parent_tree = None
271
272
    def show_diff(self, specific_files):
432 by Aaron Bentley
Misc updates
273
        """Show the diff for the specified files"""
278.1.4 by John Arbash Meinel
Just playing around.
274
        s = StringIO()
278.1.18 by John Arbash Meinel
Start checking the diff view is correct.
275
        show_diff_trees(self.parent_tree, self.rev_tree, s, specific_files,
276
                        old_label='', new_label='',
277
                        # path_encoding=sys.getdefaultencoding()
278
                        # The default is utf-8, but we interpret the file
279
                        # contents as getdefaultencoding(), so we should
280
                        # probably try to make the paths in the same encoding.
281
                        )
278.1.29 by John Arbash Meinel
Start testing with Unicode data.
282
        # str.decode(encoding, 'replace') doesn't do anything. Because if a
283
        # character is not valid in 'encoding' there is nothing to replace, the
284
        # 'replace' is for 'str.encode()'
285
        try:
286
            decoded = s.getvalue().decode(sys.getdefaultencoding())
287
        except UnicodeDecodeError:
288
            try:
289
                decoded = s.getvalue().decode('UTF-8')
290
            except UnicodeDecodeError:
291
                decoded = s.getvalue().decode('iso-8859-1')
292
                # This always works, because every byte has a valid
293
                # mapping from iso-8859-1 to Unicode
294
        # TextBuffer must contain pure UTF-8 data
295
        self.buffer.set_text(decoded.encode('UTF-8'))
278.1.4 by John Arbash Meinel
Just playing around.
296
297
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
298
class DiffWidget(Gtk.HPaned):
423.8.1 by Jelmer Vernooij
Allow using the diff control as a widget
299
    """Diff widget
278.1.4 by John Arbash Meinel
Just playing around.
300
301
    """
771.1.1 by Curtis Hovey
Added hooks for testing.
302
303
    SHOW_WIDGETS = True
304
423.8.1 by Jelmer Vernooij
Allow using the diff control as a widget
305
    def __init__(self):
306
        super(DiffWidget, self).__init__()
278.1.4 by John Arbash Meinel
Just playing around.
307
308
        # The file hierarchy: a scrollable treeview
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
309
        scrollwin = Gtk.ScrolledWindow()
310
        scrollwin.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
311
        scrollwin.set_shadow_type(Gtk.ShadowType.IN)
555.2.2 by Jasper Groenewegen
Change from checkbox to menu item in bzr vis, add menu bar + item in gdiff
312
        self.pack1(scrollwin)
771.1.1 by Curtis Hovey
Added hooks for testing.
313
        if self.SHOW_WIDGETS:
314
            scrollwin.show()
771.1.7 by Curtis Hovey
PEP8 changes.
315
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
316
        self.model = Gtk.TreeStore(str, str)
734.1.3 by Curtis Hovey
Update diff to gtk3.
317
        self.treeview = Gtk.TreeView(model=self.model)
278.1.4 by John Arbash Meinel
Just playing around.
318
        self.treeview.set_headers_visible(False)
319
        self.treeview.set_search_column(1)
320
        self.treeview.connect("cursor-changed", self._treeview_cursor_cb)
321
        scrollwin.add(self.treeview)
771.1.1 by Curtis Hovey
Added hooks for testing.
322
        if self.SHOW_WIDGETS:
323
            self.treeview.show()
278.1.4 by John Arbash Meinel
Just playing around.
324
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
325
        cell = Gtk.CellRendererText()
278.1.4 by John Arbash Meinel
Just playing around.
326
        cell.set_property("width-chars", 20)
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
327
        column = Gtk.TreeViewColumn()
734.1.3 by Curtis Hovey
Update diff to gtk3.
328
        column.pack_start(cell, True)
278.1.4 by John Arbash Meinel
Just playing around.
329
        column.add_attribute(cell, "text", 0)
330
        self.treeview.append_column(column)
331
429 by Aaron Bentley
Merge from mainline
332
    def set_diff_text(self, lines):
432 by Aaron Bentley
Misc updates
333
        """Set the current diff from a list of lines
334
335
        :param lines: The diff to show, in unified diff format
336
        """
278.1.4 by John Arbash Meinel
Just playing around.
337
        # The diffs of the  selected file: a scrollable source or
338
        # text view
487.2.3 by Aaron Bentley
Much refactoring
339
340
    def set_diff_text_sections(self, sections):
531.7.13 by Scott Scriven
Removed exception-swallowing hasattr()s.
341
        if getattr(self, 'diff_view', None) is None:
531.7.5 by Scott Scriven
Fixed DiffWidget so more than one call to set_diff() will work.
342
            self.diff_view = DiffFileView()
343
            self.pack2(self.diff_view)
771.1.3 by Curtis Hovey
Do not show widgets when not needed.
344
        if self.SHOW_WIDGETS:
345
            self.diff_view.show()
487.2.3 by Aaron Bentley
Much refactoring
346
        for oldname, newname, patch in sections:
347
            self.diff_view._diffs[newname] = str(patch)
348
            if newname is None:
349
                newname = ''
426 by Aaron Bentley
Start support for Merge Directives
350
            self.model.append(None, [oldname, newname])
427 by Aaron Bentley
Add merge button when displaying merge directives
351
        self.diff_view.show_diff(None)
278.1.4 by John Arbash Meinel
Just playing around.
352
429 by Aaron Bentley
Merge from mainline
353
    def set_diff(self, rev_tree, parent_tree):
278.1.4 by John Arbash Meinel
Just playing around.
354
        """Set the differences showed by this window.
355
356
        Compares the two trees and populates the window with the
357
        differences.
358
        """
531.7.13 by Scott Scriven
Removed exception-swallowing hasattr()s.
359
        if getattr(self, 'diff_view', None) is None:
531.7.5 by Scott Scriven
Fixed DiffWidget so more than one call to set_diff() will work.
360
            self.diff_view = DiffView()
361
            self.pack2(self.diff_view)
771.1.1 by Curtis Hovey
Added hooks for testing.
362
        if self.SHOW_WIDGETS:
363
            self.diff_view.show()
278.1.12 by John Arbash Meinel
Delay computing the delta, and clean up some of the diff view names.
364
        self.diff_view.set_trees(rev_tree, parent_tree)
278.1.4 by John Arbash Meinel
Just playing around.
365
        self.rev_tree = rev_tree
366
        self.parent_tree = parent_tree
367
368
        self.model.clear()
369
        delta = self.rev_tree.changes_from(self.parent_tree)
370
771.1.7 by Curtis Hovey
PEP8 changes.
371
        self.model.append(None, ["Complete Diff", ""])
278.1.4 by John Arbash Meinel
Just playing around.
372
373
        if len(delta.added):
771.1.7 by Curtis Hovey
PEP8 changes.
374
            titer = self.model.append(None, ["Added", None])
278.1.4 by John Arbash Meinel
Just playing around.
375
            for path, id, kind in delta.added:
771.1.7 by Curtis Hovey
PEP8 changes.
376
                self.model.append(titer, [path, path])
278.1.4 by John Arbash Meinel
Just playing around.
377
378
        if len(delta.removed):
771.1.7 by Curtis Hovey
PEP8 changes.
379
            titer = self.model.append(None, ["Removed", None])
278.1.4 by John Arbash Meinel
Just playing around.
380
            for path, id, kind in delta.removed:
771.1.7 by Curtis Hovey
PEP8 changes.
381
                self.model.append(titer, [path, path])
278.1.4 by John Arbash Meinel
Just playing around.
382
383
        if len(delta.renamed):
771.1.7 by Curtis Hovey
PEP8 changes.
384
            titer = self.model.append(None, ["Renamed", None])
278.1.4 by John Arbash Meinel
Just playing around.
385
            for oldpath, newpath, id, kind, text_modified, meta_modified \
386
                    in delta.renamed:
771.1.7 by Curtis Hovey
PEP8 changes.
387
                self.model.append(titer, [oldpath, newpath])
278.1.4 by John Arbash Meinel
Just playing around.
388
389
        if len(delta.modified):
771.1.7 by Curtis Hovey
PEP8 changes.
390
            titer = self.model.append(None, ["Modified", None])
278.1.4 by John Arbash Meinel
Just playing around.
391
            for path, id, kind, text_modified, meta_modified in delta.modified:
771.1.7 by Curtis Hovey
PEP8 changes.
392
                self.model.append(titer, [path, path])
278.1.4 by John Arbash Meinel
Just playing around.
393
394
        self.treeview.expand_all()
531.7.5 by Scott Scriven
Fixed DiffWidget so more than one call to set_diff() will work.
395
        self.diff_view.show_diff(None)
278.1.4 by John Arbash Meinel
Just playing around.
396
397
    def set_file(self, file_path):
432 by Aaron Bentley
Misc updates
398
        """Select the current file to display"""
278.1.4 by John Arbash Meinel
Just playing around.
399
        tv_path = None
400
        for data in self.model:
401
            for child in data.iterchildren():
402
                if child[0] == file_path or child[1] == file_path:
403
                    tv_path = child.path
404
                    break
405
        if tv_path is None:
677 by Vincent Ladeuil
Fix 2.1.0 compatibility issue.
406
            raise errors.NoSuchFile(file_path)
734.1.12 by Curtis Hovey
Fixed row/path issues in gannoate.
407
        self.treeview.set_cursor(tv_path, None, False)
278.1.4 by John Arbash Meinel
Just playing around.
408
        self.treeview.scroll_to_cell(tv_path)
409
410
    def _treeview_cursor_cb(self, *args):
411
        """Callback for when the treeview cursor changes."""
412
        (path, col) = self.treeview.get_cursor()
771.1.4 by Curtis Hovey
Do not update diff_view when the treeview is being destroyed.
413
        if path is None:
414
            return
771.1.7 by Curtis Hovey
PEP8 changes.
415
        specific_files = [self.model[path][1]]
416
        if specific_files == [None]:
278.1.4 by John Arbash Meinel
Just playing around.
417
            return
771.1.7 by Curtis Hovey
PEP8 changes.
418
        elif specific_files == [""]:
278.1.4 by John Arbash Meinel
Just playing around.
419
            specific_files = None
771.1.7 by Curtis Hovey
PEP8 changes.
420
278.1.12 by John Arbash Meinel
Delay computing the delta, and clean up some of the diff view names.
421
        self.diff_view.show_diff(specific_files)
771.1.7 by Curtis Hovey
PEP8 changes.
422
555.2.2 by Jasper Groenewegen
Change from checkbox to menu item in bzr vis, add menu bar + item in gdiff
423
    def _on_wraplines_toggled(self, widget=None, wrap=False):
555.2.1 by Jasper Groenewegen
Modify DiffWidget to include a checkbutton to wrap long lines in the diff view
424
        """Callback for when the wrap lines checkbutton is toggled"""
555.2.2 by Jasper Groenewegen
Change from checkbox to menu item in bzr vis, add menu bar + item in gdiff
425
        if wrap or widget.get_active():
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
426
            self.diff_view.sourceview.set_wrap_mode(Gtk.WrapMode.WORD)
555.2.1 by Jasper Groenewegen
Modify DiffWidget to include a checkbutton to wrap long lines in the diff view
427
        else:
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
428
            self.diff_view.sourceview.set_wrap_mode(Gtk.WrapMode.NONE)
278.1.29 by John Arbash Meinel
Start testing with Unicode data.
429
771.1.7 by Curtis Hovey
PEP8 changes.
430
423.8.1 by Jelmer Vernooij
Allow using the diff control as a widget
431
class DiffWindow(Window):
432
    """Diff window.
433
434
    This object represents and manages a single window containing the
435
    differences between two revisions on a branch.
436
    """
437
772.2.1 by Curtis Hovey
Added test for DiffWindow._get_button_bar.
438
    SHOW_WIDGETS = True
439
487.2.2 by Aaron Bentley
Unify MergeDirectiveWindow and DiffWindow
440
    def __init__(self, parent=None, operations=None):
734.1.51 by Curtis Hovey
Fix the initializer for many classes.
441
        super(DiffWindow, self).__init__(parent=parent)
423.8.1 by Jelmer Vernooij
Allow using the diff control as a widget
442
        self.set_border_width(0)
772.2.2 by Curtis Hovey
show_all() instead of individual calls.
443
        self.set_title("bzr diff")
423.8.1 by Jelmer Vernooij
Allow using the diff control as a widget
444
445
        # Use two thirds of the screen by default
446
        screen = self.get_screen()
447
        monitor = screen.get_monitor_geometry(0)
448
        width = int(monitor.width * 0.66)
449
        height = int(monitor.height * 0.66)
450
        self.set_default_size(width, height)
487.2.3 by Aaron Bentley
Much refactoring
451
        self.construct(operations)
423.8.1 by Jelmer Vernooij
Allow using the diff control as a widget
452
487.2.3 by Aaron Bentley
Much refactoring
453
    def construct(self, operations):
423.8.1 by Jelmer Vernooij
Allow using the diff control as a widget
454
        """Construct the window contents."""
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
455
        self.vbox = Gtk.VBox()
429 by Aaron Bentley
Merge from mainline
456
        self.add(self.vbox)
772.2.1 by Curtis Hovey
Added test for DiffWindow._get_button_bar.
457
        if self.SHOW_WIDGETS:
458
            self.vbox.show()
555.2.2 by Jasper Groenewegen
Change from checkbox to menu item in bzr vis, add menu bar + item in gdiff
459
        self.diff = DiffWidget()
460
        self.vbox.pack_end(self.diff, True, True, 0)
772.2.1 by Curtis Hovey
Added test for DiffWindow._get_button_bar.
461
        if self.SHOW_WIDGETS:
462
            self.diff.show_all()
555.2.2 by Jasper Groenewegen
Change from checkbox to menu item in bzr vis, add menu bar + item in gdiff
463
        # Build after DiffWidget to connect signals
464
        menubar = self._get_menu_bar()
465
        self.vbox.pack_start(menubar, False, False, 0)
487.2.3 by Aaron Bentley
Much refactoring
466
        hbox = self._get_button_bar(operations)
429 by Aaron Bentley
Merge from mainline
467
        if hbox is not None:
555.2.2 by Jasper Groenewegen
Change from checkbox to menu item in bzr vis, add menu bar + item in gdiff
468
            self.vbox.pack_start(hbox, False, True, 0)
771.1.7 by Curtis Hovey
PEP8 changes.
469
555.2.2 by Jasper Groenewegen
Change from checkbox to menu item in bzr vis, add menu bar + item in gdiff
470
    def _get_menu_bar(self):
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
471
        menubar = Gtk.MenuBar()
555.2.2 by Jasper Groenewegen
Change from checkbox to menu item in bzr vis, add menu bar + item in gdiff
472
        # View menu
734.1.38 by Curtis Hovey
Menu fixes.
473
        mb_view = Gtk.MenuItem.new_with_mnemonic(_i18n("_View"))
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
474
        mb_view_menu = Gtk.Menu()
734.1.38 by Curtis Hovey
Menu fixes.
475
        mb_view_wrapsource = Gtk.CheckMenuItem.new_with_mnemonic(
476
            _i18n("Wrap _Long Lines"))
555.2.2 by Jasper Groenewegen
Change from checkbox to menu item in bzr vis, add menu bar + item in gdiff
477
        mb_view_wrapsource.connect('activate', self.diff._on_wraplines_toggled)
478
        mb_view_menu.append(mb_view_wrapsource)
479
        mb_view.set_submenu(mb_view_menu)
480
        menubar.append(mb_view)
772.2.1 by Curtis Hovey
Added test for DiffWindow._get_button_bar.
481
        if self.SHOW_WIDGETS:
772.2.2 by Curtis Hovey
show_all() instead of individual calls.
482
            menubar.show_all()
555.2.2 by Jasper Groenewegen
Change from checkbox to menu item in bzr vis, add menu bar + item in gdiff
483
        return menubar
771.1.7 by Curtis Hovey
PEP8 changes.
484
487.2.3 by Aaron Bentley
Much refactoring
485
    def _get_button_bar(self, operations):
432 by Aaron Bentley
Misc updates
486
        """Return a button bar to use.
487
488
        :return: None, meaning that no button bar will be used.
489
        """
487.2.3 by Aaron Bentley
Much refactoring
490
        if operations is None:
487.2.2 by Aaron Bentley
Unify MergeDirectiveWindow and DiffWindow
491
            return None
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
492
        hbox = Gtk.HButtonBox()
493
        hbox.set_layout(Gtk.ButtonBoxStyle.START)
487.2.3 by Aaron Bentley
Much refactoring
494
        for title, method in operations:
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
495
            merge_button = Gtk.Button(title)
772.2.1 by Curtis Hovey
Added test for DiffWindow._get_button_bar.
496
            if self.SHOW_WIDGETS:
497
                merge_button.show()
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
498
            merge_button.set_relief(Gtk.ReliefStyle.NONE)
487.2.2 by Aaron Bentley
Unify MergeDirectiveWindow and DiffWindow
499
            merge_button.connect("clicked", method)
772.2.1 by Curtis Hovey
Added test for DiffWindow._get_button_bar.
500
            hbox.pack_start(merge_button, False, True, 0)
501
        if self.SHOW_WIDGETS:
502
            hbox.show()
487.2.2 by Aaron Bentley
Unify MergeDirectiveWindow and DiffWindow
503
        return hbox
504
505
    def _get_merge_target(self):
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
506
        d = Gtk.FileChooserDialog('Merge branch', self,
507
                                  Gtk.FileChooserAction.SELECT_FOLDER,
508
                                  buttons=(Gtk.STOCK_OK, Gtk.ResponseType.OK,
509
                                           Gtk.STOCK_CANCEL,
510
                                           Gtk.ResponseType.CANCEL,))
487.2.2 by Aaron Bentley
Unify MergeDirectiveWindow and DiffWindow
511
        try:
512
            result = d.run()
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
513
            if result != Gtk.ResponseType.OK:
487.2.2 by Aaron Bentley
Unify MergeDirectiveWindow and DiffWindow
514
                raise SelectCancelled()
515
            return d.get_current_folder_uri()
516
        finally:
517
            d.destroy()
518
487.2.5 by Aaron Bentley
Test successful merge
519
    def _merge_successful(self):
520
        # No conflicts found.
492 by Aaron Bentley
Allow saving from patch window, refactoring, testing.
521
        info_dialog(_i18n('Merge successful'),
522
                    _i18n('All changes applied successfully.'))
487.2.5 by Aaron Bentley
Test successful merge
523
487.2.7 by Aaron Bentley
Add more merge tests
524
    def _conflicts(self):
492 by Aaron Bentley
Allow saving from patch window, refactoring, testing.
525
        warning_dialog(_i18n('Conflicts encountered'),
526
                       _i18n('Please resolve the conflicts manually'
527
                             ' before committing.'))
487.2.7 by Aaron Bentley
Add more merge tests
528
487.2.8 by Aaron Bentley
Update error handling to use window
529
    def _handle_error(self, e):
530
        error_dialog('Error', str(e))
487.2.7 by Aaron Bentley
Add more merge tests
531
487.2.2 by Aaron Bentley
Unify MergeDirectiveWindow and DiffWindow
532
    def _get_save_path(self, basename):
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
533
        d = Gtk.FileChooserDialog('Save As', self,
534
                                  Gtk.FileChooserAction.SAVE,
535
                                  buttons=(Gtk.STOCK_OK, Gtk.ResponseType.OK,
536
                                           Gtk.STOCK_CANCEL,
537
                                           Gtk.ResponseType.CANCEL,))
487.2.2 by Aaron Bentley
Unify MergeDirectiveWindow and DiffWindow
538
        d.set_current_name(basename)
539
        try:
540
            result = d.run()
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
541
            if result != Gtk.ResponseType.OK:
487.2.2 by Aaron Bentley
Unify MergeDirectiveWindow and DiffWindow
542
                raise SelectCancelled()
543
            return urlutils.local_path_from_url(d.get_uri())
544
        finally:
545
            d.destroy()
429 by Aaron Bentley
Merge from mainline
546
423.8.1 by Jelmer Vernooij
Allow using the diff control as a widget
547
    def set_diff(self, description, rev_tree, parent_tree):
548
        """Set the differences showed by this window.
549
550
        Compares the two trees and populates the window with the
551
        differences.
552
        """
553
        self.diff.set_diff(rev_tree, parent_tree)
554
        self.set_title(description + " - bzrk diff")
555
556
    def set_file(self, file_path):
557
        self.diff.set_file(file_path)
558
559
487.2.2 by Aaron Bentley
Unify MergeDirectiveWindow and DiffWindow
560
class DiffController(object):
561
688.3.1 by Toshio Kuratomi
Fix bzr-handle-patch to process patches with leading and trailing comments with
562
    def __init__(self, path, patch, window=None, allow_dirty=False):
487.2.2 by Aaron Bentley
Unify MergeDirectiveWindow and DiffWindow
563
        self.path = path
564
        self.patch = patch
688.3.1 by Toshio Kuratomi
Fix bzr-handle-patch to process patches with leading and trailing comments with
565
        self.allow_dirty = allow_dirty
487.2.2 by Aaron Bentley
Unify MergeDirectiveWindow and DiffWindow
566
        if window is None:
567
            window = DiffWindow(operations=self._provide_operations())
568
            self.initialize_window(window)
487.2.3 by Aaron Bentley
Much refactoring
569
        self.window = window
487.2.2 by Aaron Bentley
Unify MergeDirectiveWindow and DiffWindow
570
571
    def initialize_window(self, window):
487.2.3 by Aaron Bentley
Much refactoring
572
        window.diff.set_diff_text_sections(self.get_diff_sections())
573
        window.set_title(self.path + " - diff")
574
575
    def get_diff_sections(self):
576
        yield "Complete Diff", None, ''.join(self.patch)
688.3.1 by Toshio Kuratomi
Fix bzr-handle-patch to process patches with leading and trailing comments with
577
        # allow_dirty was added to parse_patches in bzrlib 2.2b1
578
        if 'allow_dirty' in inspect.getargspec(parse_patches).args:
579
            patches = parse_patches(self.patch, allow_dirty=self.allow_dirty)
580
        else:
581
            patches = parse_patches(self.patch)
582
        for patch in patches:
487.2.3 by Aaron Bentley
Much refactoring
583
            oldname = patch.oldname.split('\t')[0]
584
            newname = patch.newname.split('\t')[0]
585
            yield oldname, newname, str(patch)
487.2.2 by Aaron Bentley
Unify MergeDirectiveWindow and DiffWindow
586
587
    def perform_save(self, window):
588
        try:
589
            save_path = self.window._get_save_path(osutils.basename(self.path))
590
        except SelectCancelled:
591
            return
592
        source = open(self.path, 'rb')
593
        try:
594
            target = open(save_path, 'wb')
595
            try:
596
                osutils.pumpfile(source, target)
597
            finally:
598
                target.close()
599
        finally:
600
            source.close()
601
602
    def _provide_operations(self):
603
        return [('Save', self.perform_save)]
604
605
606
class MergeDirectiveController(DiffController):
607
487.2.8 by Aaron Bentley
Update error handling to use window
608
    def __init__(self, path, directive, window=None):
734.1.51 by Curtis Hovey
Fix the initializer for many classes.
609
        super(MergeDirectiveController, self).__init__(
610
            path, directive.patch.splitlines(True), window)
428 by Aaron Bentley
Get merging working
611
        self.directive = directive
487.2.1 by Aaron Bentley
Refactor merge directive window into MergeController
612
        self.merge_target = None
613
614
    def _provide_operations(self):
615
        return [('Merge', self.perform_merge), ('Save', self.perform_save)]
427 by Aaron Bentley
Add merge button when displaying merge directives
616
428 by Aaron Bentley
Get merging working
617
    def perform_merge(self, window):
487.2.1 by Aaron Bentley
Refactor merge directive window into MergeController
618
        if self.merge_target is None:
619
            try:
620
                self.merge_target = self.window._get_merge_target()
621
            except SelectCancelled:
622
                return
623
        tree = workingtree.WorkingTree.open(self.merge_target)
428 by Aaron Bentley
Get merging working
624
        tree.lock_write()
625
        try:
626
            try:
677 by Vincent Ladeuil
Fix 2.1.0 compatibility issue.
627
                if tree.has_changes():
628
                    raise errors.UncommittedChanges(tree)
629
                merger, verified = _mod_merge.Merger.from_mergeable(
630
                    tree, self.directive, pb=None)
428 by Aaron Bentley
Get merging working
631
                merger.merge_type = _mod_merge.Merge3Merger
430 by Aaron Bentley
Handle conflicts appropriately
632
                conflict_count = merger.do_merge()
428 by Aaron Bentley
Get merging working
633
                merger.set_pending()
430 by Aaron Bentley
Handle conflicts appropriately
634
                if conflict_count == 0:
487.2.5 by Aaron Bentley
Test successful merge
635
                    self.window._merge_successful()
430 by Aaron Bentley
Handle conflicts appropriately
636
                else:
487.2.7 by Aaron Bentley
Add more merge tests
637
                    self.window._conflicts()
430 by Aaron Bentley
Handle conflicts appropriately
638
                    # There are conflicts to be resolved.
487.2.1 by Aaron Bentley
Refactor merge directive window into MergeController
639
                self.window.destroy()
428 by Aaron Bentley
Get merging working
640
            except Exception, e:
487.2.8 by Aaron Bentley
Update error handling to use window
641
                self.window._handle_error(e)
428 by Aaron Bentley
Get merging working
642
        finally:
643
            tree.unlock()
644
427 by Aaron Bentley
Add merge button when displaying merge directives
645
450 by Aaron Bentley
Update to use new Tree.iter_changes
646
def iter_changes_to_status(source, target):
278.1.29 by John Arbash Meinel
Start testing with Unicode data.
647
    """Determine the differences between trees.
648
450 by Aaron Bentley
Update to use new Tree.iter_changes
649
    This is a wrapper around iter_changes which just yields more
278.1.29 by John Arbash Meinel
Start testing with Unicode data.
650
    understandable results.
651
652
    :param source: The source tree (basis tree)
653
    :param target: The target tree
654
    :return: A list of (file_id, real_path, change_type, display_path)
655
    """
656
    added = 'added'
657
    removed = 'removed'
658
    renamed = 'renamed'
659
    renamed_and_modified = 'renamed and modified'
660
    modified = 'modified'
661
    kind_changed = 'kind changed'
613.1.1 by Vincent Ladeuil
Fix bug #286834 bu handling 'missing' files corner case.
662
    missing = 'missing'
278.1.29 by John Arbash Meinel
Start testing with Unicode data.
663
664
    # TODO: Handle metadata changes
665
666
    status = []
667
    target.lock_read()
668
    try:
669
        source.lock_read()
670
        try:
671
            for (file_id, paths, changed_content, versioned, parent_ids, names,
450 by Aaron Bentley
Update to use new Tree.iter_changes
672
                 kinds, executables) in target.iter_changes(source):
278.1.29 by John Arbash Meinel
Start testing with Unicode data.
673
674
                # Skip the root entry if it isn't very interesting
675
                if parent_ids == (None, None):
676
                    continue
677
678
                change_type = None
679
                if kinds[0] is None:
680
                    source_marker = ''
681
                else:
682
                    source_marker = osutils.kind_marker(kinds[0])
613.1.1 by Vincent Ladeuil
Fix bug #286834 bu handling 'missing' files corner case.
683
278.1.29 by John Arbash Meinel
Start testing with Unicode data.
684
                if kinds[1] is None:
613.1.1 by Vincent Ladeuil
Fix bug #286834 bu handling 'missing' files corner case.
685
                    if kinds[0] is None:
686
                        # We assume bzr will flag only files in that case,
687
                        # there may be a bzr bug there as only files seems to
688
                        # not receive any kind.
689
                        marker = osutils.kind_marker('file')
690
                    else:
691
                        marker = osutils.kind_marker(kinds[0])
278.1.29 by John Arbash Meinel
Start testing with Unicode data.
692
                else:
693
                    marker = osutils.kind_marker(kinds[1])
694
695
                real_path = paths[1]
696
                if real_path is None:
697
                    real_path = paths[0]
698
                assert real_path is not None
699
700
                present_source = versioned[0] and kinds[0] is not None
701
                present_target = versioned[1] and kinds[1] is not None
702
613.1.1 by Vincent Ladeuil
Fix bug #286834 bu handling 'missing' files corner case.
703
                if kinds[0] is None and kinds[1] is None:
704
                    change_type = missing
705
                    display_path = real_path + marker
706
                elif present_source != present_target:
278.1.29 by John Arbash Meinel
Start testing with Unicode data.
707
                    if present_target:
708
                        change_type = added
709
                    else:
710
                        assert present_source
711
                        change_type = removed
613.1.1 by Vincent Ladeuil
Fix bug #286834 bu handling 'missing' files corner case.
712
                    display_path = real_path + marker
278.1.29 by John Arbash Meinel
Start testing with Unicode data.
713
                elif names[0] != names[1] or parent_ids[0] != parent_ids[1]:
714
                    # Renamed
715
                    if changed_content or executables[0] != executables[1]:
716
                        # and modified
717
                        change_type = renamed_and_modified
718
                    else:
719
                        change_type = renamed
720
                    display_path = (paths[0] + source_marker
721
                                    + ' => ' + paths[1] + marker)
722
                elif kinds[0] != kinds[1]:
723
                    change_type = kind_changed
724
                    display_path = (paths[0] + source_marker
725
                                    + ' => ' + paths[1] + marker)
605.1.1 by John Arbash Meinel
just use changed_content as a truth value, rather than checking 'is True'
726
                elif changed_content or executables[0] != executables[1]:
278.1.29 by John Arbash Meinel
Start testing with Unicode data.
727
                    change_type = modified
613.1.1 by Vincent Ladeuil
Fix bug #286834 bu handling 'missing' files corner case.
728
                    display_path = real_path + marker
278.1.29 by John Arbash Meinel
Start testing with Unicode data.
729
                else:
730
                    assert False, "How did we get here?"
731
732
                status.append((file_id, real_path, change_type, display_path))
733
        finally:
734
            source.unlock()
735
    finally:
736
        target.unlock()
737
738
    return status