/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/plugins/quilt/__init__.py

  • Committer: Jelmer Vernooij
  • Date: 2020-07-18 23:14:00 UTC
  • mfrom: (7490.40.62 work)
  • mto: This revision was merged to the branch mainline in revision 7519.
  • Revision ID: jelmer@jelmer.uk-20200718231400-jaes9qltn8oi8xss
Merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/quilt/__init__.py
113
113
    config = tree.get_config_stack()
114
114
    policy = config.get('quilt.commit_policy')
115
115
    from .merge import start_commit_quilt_patches
116
 
    start_commit_quilt_patches(tree, policy)
 
116
    from .wrapper import QuiltNotInstalled
 
117
    try:
 
118
        start_commit_quilt_patches(tree, policy)
 
119
    except QuiltNotInstalled:
 
120
        trace.warning(
 
121
            'quilt not installed; not updating patches')
117
122
 
118
123
 
119
124
def post_build_tree_quilt(tree):
122
127
    if policy is None:
123
128
        return
124
129
    from .merge import post_process_quilt_patches
125
 
    post_process_quilt_patches(tree, [], policy)
 
130
    from .wrapper import QuiltNotInstalled
 
131
    try:
 
132
        post_process_quilt_patches(tree, [], policy)
 
133
    except QuiltNotInstalled:
 
134
        trace.warning(
 
135
            'quilt not installed; not touching patches')
126
136
 
127
137
 
128
138
from ...hooks import install_lazy_named_hook