← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/reconcile.py

  • Committer: Andrew Bennetts
  • Date: 2011-05-18 16:42:48 UTC
  • mto: This revision was merged to the branch mainline in revision 5895.
  • Revision ID: andrew.bennetts@canonical.com-20110518164248-o84lxxjpbn1ib6zv
Fix a bunch of docstring formatting nits, making pydoctor a bit happier.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/reconcile.py
64
64
        """Perform reconciliation.
65
65
 
66
66
        After reconciliation the following attributes document found issues:
67
 
        inconsistent_parents: The number of revisions in the repository whose
68
 
                              ancestry was being reported incorrectly.
69
 
        garbage_inventories: The number of inventory objects without revisions
70
 
                             that were garbage collected.
71
 
        fixed_branch_history: None if there was no branch, False if the branch
72
 
                              history was correct, True if the branch history
73
 
                              needed to be re-normalized.
 
67
 
 
68
        * `inconsistent_parents`: The number of revisions in the repository
 
69
          whose ancestry was being reported incorrectly.
 
70
        * `garbage_inventories`: The number of inventory objects without
 
71
          revisions that were garbage collected.
 
72
        * `fixed_branch_history`: None if there was no branch, False if the
 
73
          branch history was correct, True if the branch history needed to be
 
74
          re-normalized.
74
75
        """
75
76
        self.pb = ui.ui_factory.nested_progress_bar()
76
77
        try:
196
197
        """Perform reconciliation.
197
198
 
198
199
        After reconciliation the following attributes document found issues:
199
 
        inconsistent_parents: The number of revisions in the repository whose
200
 
                              ancestry was being reported incorrectly.
201
 
        garbage_inventories: The number of inventory objects without revisions
202
 
                             that were garbage collected.
 
200
 
 
201
        * `inconsistent_parents`: The number of revisions in the repository
 
202
          whose ancestry was being reported incorrectly.
 
203
        * `garbage_inventories`: The number of inventory objects without
 
204
          revisions that were garbage collected.
203
205
        """
204
206
        operation = cleanup.OperationWithCleanups(self._reconcile)
205
207
        self.add_cleanup = operation.add_cleanup