/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/status.py

  • Committer: Jelmer Vernooij
  • Date: 2019-03-04 05:10:44 UTC
  • mfrom: (7293 work)
  • mto: This revision was merged to the branch mainline in revision 7294.
  • Revision ID: jelmer@jelmer.uk-20190304051044-vph4s8p9qvpy2qe9
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/status.py
150
150
                new = wt
151
151
        with old.lock_read(), new.lock_read():
152
152
            for hook in hooks['pre_status']:
153
 
                hook(StatusHookParams(old, new, to_file, versioned,
154
 
                                      show_ids, short, verbose, specific_files=specific_files))
 
153
                hook(StatusHookParams(
 
154
                    old, new, to_file, versioned, show_ids, short, verbose,
 
155
                    specific_files=specific_files))
155
156
 
156
157
            specific_files, nonexistents \
157
158
                = _filter_nonexistent(specific_files, old, new)
158
159
            want_unversioned = not versioned
159
160
 
160
161
            # Reporter used for short outputs
161
 
            reporter = _mod_delta._ChangeReporter(output_file=to_file,
162
 
                                                  unversioned_filter=new.is_ignored, classify=classify)
 
162
            reporter = _mod_delta._ChangeReporter(
 
163
                output_file=to_file, unversioned_filter=new.is_ignored,
 
164
                classify=classify)
163
165
            report_changes(to_file, old, new, specific_files,
164
166
                           reporter, show_long_callback,
165
167
                           short=short, want_unversioned=want_unversioned,
183
185
            # delta.
184
186
            conflicts = new.conflicts()
185
187
            if specific_files is not None:
186
 
                conflicts = conflicts.select_conflicts(new, specific_files,
187
 
                                                       ignore_misses=True, recurse=True)[1]
 
188
                conflicts = conflicts.select_conflicts(
 
189
                    new, specific_files, ignore_misses=True, recurse=True)[1]
188
190
            if len(conflicts) > 0 and not short:
189
191
                to_file.write("conflicts:\n")
190
192
            for conflict in conflicts:
214
216
            if nonexistents:
215
217
                raise errors.PathsDoNotExist(nonexistents)
216
218
            for hook in hooks['post_status']:
217
 
                hook(StatusHookParams(old, new, to_file, versioned,
218
 
                                      show_ids, short, verbose, specific_files=specific_files))
 
219
                hook(StatusHookParams(
 
220
                    old, new, to_file, versioned, show_ids, short, verbose,
 
221
                    specific_files=specific_files))
219
222
 
220
223
 
221
224
def _get_sorted_revisions(tip_revision, revision_ids, parent_map):
341
344
    s = old_tree.filter_unversioned_files(orig_paths)
342
345
    s = new_tree.filter_unversioned_files(s)
343
346
    nonexistent = [path for path in s if not new_tree.has_filename(path)]
344
 
    remaining = [path for path in orig_paths if not path in nonexistent]
 
347
    remaining = [path for path in orig_paths if path not in nonexistent]
345
348
    # Sorting the 'remaining' list doesn't have much effect in
346
349
    # practice, since the various status output sections will sort
347
350
    # their groups individually.  But for consistency of this