/breezy/trunk

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/trunk

« back to all changes in this revision

Viewing changes to breezy/status.py

  • Committer: Jelmer Vernooij
  • Date: 2017-07-23 22:06:41 UTC
  • mfrom: (6738 trunk)
  • mto: This revision was merged to the branch mainline in revision 6739.
  • Revision ID: jelmer@jelmer.uk-20170723220641-69eczax9bmv8d6kk
Merge trunk, address review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
297
297
    log_formatter = log.LineLogFormatter(to_file)
298
298
    for merge in pending:
299
299
        try:
300
 
            rev = branch.repository.get_revisions([merge])[0]
 
300
            rev = branch.repository.get_revision(merge)
301
301
        except errors.NoSuchRevision:
302
302
            # If we are missing a revision, just print out the revision id
303
303
            to_file.write(first_prefix + '(ghost) ' + merge + '\n')
316
316
        merge_extra.discard(_mod_revision.NULL_REVISION)
317
317
 
318
318
        # Get a handle to all of the revisions we will need
319
 
        try:
320
 
            revisions = dict((rev.revision_id, rev) for rev in
321
 
                             branch.repository.get_revisions(merge_extra))
322
 
        except errors.NoSuchRevision:
323
 
            # One of the sub nodes is a ghost, check each one
324
 
            revisions = {}
325
 
            for revision_id in merge_extra:
326
 
                try:
327
 
                    rev = branch.repository.get_revisions([revision_id])[0]
328
 
                except errors.NoSuchRevision:
329
 
                    revisions[revision_id] = None
330
 
                else:
331
 
                    revisions[revision_id] = rev
 
319
        revisions = dict(branch.repository.iter_revisions(merge_extra))
332
320
 
333
321
        # Display the revisions brought in by this merge.
334
322
        rev_id_iterator = _get_sorted_revisions(merge, merge_extra,