/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
5321.1.69 by Gordon Tyler
Fixed line-endings to be Unix.
1
# Copyright (C) 2010 Canonical Ltd.
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
6379.6.7 by Jelmer Vernooij
Move importing from future until after doc string, otherwise the doc string will disappear.
17
"""Utility functions for managing external merge tools such as kdiff3."""
18
5321.1.69 by Gordon Tyler
Fixed line-endings to be Unix.
19
import os
20
import shutil
21
import subprocess
22
import sys
23
import tempfile
24
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
25
from .lazy_import import lazy_import
5321.1.69 by Gordon Tyler
Fixed line-endings to be Unix.
26
lazy_import(globals(), """
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
27
from breezy import (
5321.1.69 by Gordon Tyler
Fixed line-endings to be Unix.
28
    cmdline,
5321.1.83 by Gordon Tyler
Use osutils.find_executable_on_path in is_available instead.
29
    osutils,
5321.1.69 by Gordon Tyler
Fixed line-endings to be Unix.
30
    trace,
31
)
32
""")
33
34
5321.1.108 by Gordon Tyler
Changed known merge tools into a default set of merge tools that are always defined but can be overridden by user-defined merge tools.
35
known_merge_tools = {
5321.2.8 by Vincent Ladeuil
_KNOWN_MERGE_TOOLS should be a dict (there is an hidden assumption that the merg tool is unique anyway).
36
    'bcompare': 'bcompare {this} {other} {base} {result}',
37
    'kdiff3': 'kdiff3 {base} {this} {other} -o {result}',
38
    'xdiff': 'xxdiff -m -O -M {result} {this} {base} {other}',
39
    'meld': 'meld {base} {this_temp} {other}',
40
    'opendiff': 'opendiff {this} {other} -ancestor {base} -merge {result}',
41
    'winmergeu': 'winmergeu {result}',
42
}
5321.1.116 by Gordon Tyler
Simplified mergetools module down to functions which deal with command lines -- no MergeTool class.
43
44
45
def check_availability(command_line):
46
    cmd_list = cmdline.split(command_line)
47
    exe = cmd_list[0]
48
    if sys.platform == 'win32':
6437.44.1 by Gordon Tyler
Backport of fix for bug 939605 to bzr 2.5 series.
49
        exe = _get_executable_path(exe)
50
        if exe is None:
51
            return False
52
        base, ext = os.path.splitext(exe)
6973.6.4 by Jelmer Vernooij
Avoid text_type()
53
        path_ext = [s.lower()
6437.44.1 by Gordon Tyler
Backport of fix for bug 939605 to bzr 2.5 series.
54
                    for s in os.getenv('PATHEXT', '').split(os.pathsep)]
55
        return os.path.exists(exe) and ext in path_ext
5321.1.116 by Gordon Tyler
Simplified mergetools module down to functions which deal with command lines -- no MergeTool class.
56
    else:
7143.15.2 by Jelmer Vernooij
Run autopep8.
57
        return (os.access(exe, os.X_OK) or
58
                osutils.find_executable_on_path(exe) is not None)
5321.1.116 by Gordon Tyler
Simplified mergetools module down to functions which deal with command lines -- no MergeTool class.
59
60
61
def invoke(command_line, filename, invoker=None):
62
    """Invokes the given merge tool command line, substituting the given
63
    filename according to the embedded substitution markers. Optionally, it
64
    will use the given invoker function instead of the default
65
    subprocess_invoker.
66
    """
67
    if invoker is None:
68
        invoker = subprocess_invoker
69
    cmd_list = cmdline.split(command_line)
6437.44.1 by Gordon Tyler
Backport of fix for bug 939605 to bzr 2.5 series.
70
    exe = _get_executable_path(cmd_list[0])
71
    if exe is not None:
72
        cmd_list[0] = exe
5321.1.116 by Gordon Tyler
Simplified mergetools module down to functions which deal with command lines -- no MergeTool class.
73
    args, tmp_file = _subst_filename(cmd_list, filename)
7143.15.2 by Jelmer Vernooij
Run autopep8.
74
5321.1.116 by Gordon Tyler
Simplified mergetools module down to functions which deal with command lines -- no MergeTool class.
75
    def cleanup(retcode):
76
        if tmp_file is not None:
7143.15.2 by Jelmer Vernooij
Run autopep8.
77
            if retcode == 0:  # on success, replace file with temp file
5321.1.116 by Gordon Tyler
Simplified mergetools module down to functions which deal with command lines -- no MergeTool class.
78
                shutil.move(tmp_file, filename)
7143.15.2 by Jelmer Vernooij
Run autopep8.
79
            else:  # otherwise, delete temp file
5321.1.116 by Gordon Tyler
Simplified mergetools module down to functions which deal with command lines -- no MergeTool class.
80
                os.remove(tmp_file)
81
    return invoker(args[0], args[1:], cleanup)
82
83
6437.44.1 by Gordon Tyler
Backport of fix for bug 939605 to bzr 2.5 series.
84
def _get_executable_path(exe):
85
    if os.path.isabs(exe):
86
        return exe
87
    return osutils.find_executable_on_path(exe)
88
89
5321.1.116 by Gordon Tyler
Simplified mergetools module down to functions which deal with command lines -- no MergeTool class.
90
def _subst_filename(args, filename):
91
    subst_names = {
5321.1.119 by Gordon Tyler
Replace usage of format function from python 2.6 with our own very simple formatting function.
92
        'base': filename + u'.BASE',
93
        'this': filename + u'.THIS',
94
        'other': filename + u'.OTHER',
95
        'result': filename,
5321.1.116 by Gordon Tyler
Simplified mergetools module down to functions which deal with command lines -- no MergeTool class.
96
    }
97
    tmp_file = None
98
    subst_args = []
99
    for arg in args:
7143.15.5 by Jelmer Vernooij
More PEP8 fixes.
100
        if '{this_temp}' in arg and 'this_temp' not in subst_names:
5321.1.116 by Gordon Tyler
Simplified mergetools module down to functions which deal with command lines -- no MergeTool class.
101
            fh, tmp_file = tempfile.mkstemp(u"_bzr_mergetools_%s.THIS" %
102
                                            os.path.basename(filename))
103
            trace.mutter('fh=%r, tmp_file=%r', fh, tmp_file)
104
            os.close(fh)
105
            shutil.copy(filename + u".THIS", tmp_file)
106
            subst_names['this_temp'] = tmp_file
5321.1.119 by Gordon Tyler
Replace usage of format function from python 2.6 with our own very simple formatting function.
107
        arg = _format_arg(arg, subst_names)
5321.1.116 by Gordon Tyler
Simplified mergetools module down to functions which deal with command lines -- no MergeTool class.
108
        subst_args.append(arg)
109
    return subst_args, tmp_file
110
111
5321.1.119 by Gordon Tyler
Replace usage of format function from python 2.6 with our own very simple formatting function.
112
# This would be better implemented using format() from python 2.6
113
def _format_arg(arg, subst_names):
114
    arg = arg.replace('{base}', subst_names['base'])
115
    arg = arg.replace('{this}', subst_names['this'])
116
    arg = arg.replace('{other}', subst_names['other'])
117
    arg = arg.replace('{result}', subst_names['result'])
6619.3.1 by Jelmer Vernooij
Apply 2to3 has_key fix.
118
    if 'this_temp' in subst_names:
5321.1.119 by Gordon Tyler
Replace usage of format function from python 2.6 with our own very simple formatting function.
119
        arg = arg.replace('{this_temp}', subst_names['this_temp'])
120
    return arg
121
122
5321.1.116 by Gordon Tyler
Simplified mergetools module down to functions which deal with command lines -- no MergeTool class.
123
def subprocess_invoker(executable, args, cleanup):
124
    retcode = subprocess.call([executable] + args)
125
    cleanup(retcode)
126
    return retcode