Merge lp:~jelmer/brz/google-docstrings-2 into lp:brz

[Jelmer Vernooij]

Use more google docstrings.

Use more google docstrings.

[The Breezy Bot (the-breezy-bot)]

Voting criteria not met
https://ci.breezy-vcs.org/job/brz/job/brz-land/985/

[Jelmer Vernooij (jelmer)]

review: Approve

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/987/

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/989/

[lp:~jelmer/brz/google-docstrings-2]

7600. By Jelmer Vernooij on 2022-10-30

Merge lp:brz/3.3

7601. By Jelmer Vernooij on 2022-10-30

Convert breezy.tree.

Unmerged revisions

=== modified file 'breezy/branch.py'
--- breezy/branch.py	2021-12-25 15:36:32 +0000
+++ breezy/branch.py	2022-07-09 22:09:46 +0000
@@ -14,6 +14,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
+__docformat__ = "google"
+
 from typing import Optional, Tuple
 
 from .lazy_import import lazy_import
@@ -74,8 +76,9 @@
 class Branch(controldir.ControlComponent):
     """Branch holding a history of revisions.
 
-    :ivar hooks: An instance of BranchHooks.
-    :ivar _master_branch_cache: cached result of get_master_branch, see
+    Attributes:
+      hooks: An instance of BranchHooks.
+      _master_branch_cache: cached result of get_master_branch, see
         _clear_cached_state.
     """
 
@@ -149,9 +152,10 @@
         encountered.  Otherwise, stop when the beginning of history is
         reached.
 
-        :param stop_index: The index which should be present.  When it is
+        Args:
+          stop_index: The index which should be present.  When it is
             present, history extension will stop.
-        :param stop_revision: The revision id which should be present.  When
+          stop_revision: The revision id which should be present.  When
             it is encountered, history extension will stop.
         """
         if len(self._partial_revision_history_cache) == 0:
@@ -227,7 +231,7 @@
         This can then be used to get and set configuration options for the
         branch.
 
-        :return: A breezy.config.BranchConfig.
+        Returns: A breezy.config.BranchConfig.
         """
         return _mod_config.BranchConfig(self)
 
@@ -237,14 +241,15 @@
         This can then be used to get and set configuration options for the
         branch.
 
-        :return: A breezy.config.BranchStack.
+        Returns: A breezy.config.BranchStack.
         """
         return _mod_config.BranchStack(self)
 
     def store_uncommitted(self, creator):
         """Store uncommitted changes from a ShelfCreator.
 
-        :param creator: The ShelfCreator containing uncommitted changes, or
+        Args:
+          creator: The ShelfCreator containing uncommitted changes, or
             None to delete any stored changes.
         :raises: ChangesAlreadyStored if the branch already has changes.
         """
@@ -253,8 +258,9 @@
     def get_unshelver(self, tree):
         """Return a shelf.Unshelver for this branch and tree.
 
-        :param tree: The tree to use to construct the Unshelver.
-        :return: an Unshelver or None if no changes are stored.
+        Args:
+          tree: The tree to use to construct the Unshelver.
+        Returns: an Unshelver or None if no changes are stored.
         """
         raise NotImplementedError(self.get_unshelver)
 
@@ -322,16 +328,16 @@
     def lock_write(self, token=None):
         """Lock the branch for write operations.
 
-        :param token: A token to permit reacquiring a previously held and
+          token: A token to permit reacquiring a previously held and
             preserved lock.
-        :return: A BranchWriteLockResult.
+        Returns: A BranchWriteLockResult.
         """
         raise NotImplementedError(self.lock_write)
 
     def lock_read(self):
         """Lock the branch for read operations.
 
-        :return: A breezy.lock.LogicalLockResult.
+        Returns: A breezy.lock.LogicalLockResult.
         """
         raise NotImplementedError(self.lock_read)
 
@@ -348,12 +354,13 @@
     def dotted_revno_to_revision_id(self, revno, _cache_reverse=False):
         """Return the revision_id for a dotted revno.
 
-        :param revno: a tuple like (1,) or (1,1,2)
-        :param _cache_reverse: a private parameter enabling storage
+        Args:
+          revno: a tuple like (1,) or (1,1,2)
+          _cache_reverse: a private parameter enabling storage
            of the reverse mapping in a top level cache. (This should
            only be done in selective circumstances as we want to
            avoid having the mapping cached multiple times.)
-        :return: the revision_id
+        Returns: the revision_id
         :raises errors.NoSuchRevision: if the revno doesn't exist
         """
         with self.lock_read():
@@ -386,7 +393,7 @@
     def revision_id_to_dotted_revno(self, revision_id):
         """Given a revision id, return its dotted revno.
 
-        :return: a tuple like (1,) or (400,1,3).
+        Returns: a tuple like (1,) or (400,1,3).
         """
         with self.lock_read():
             return self._do_revision_id_to_dotted_revno(revision_id)
@@ -417,7 +424,7 @@
 
         This will be regenerated on demand, but will be cached.
 
-        :return: A dictionary mapping revision_id => dotted revno.
+        Returns: A dictionary mapping revision_id => dotted revno.
             This dictionary should not be modified by the caller.
         """
         if 'evil' in debug.debug_flags:
@@ -443,7 +450,7 @@
         This is the worker function for get_revision_id_to_revno_map, which
         just caches the return value.
 
-        :return: A dictionary mapping revision_id => dotted revno.
+        Returns: A dictionary mapping revision_id => dotted revno.
         """
         revision_id_to_revno = {
             rev_id: revno for rev_id, depth, revno, end_of_merge
@@ -459,11 +466,12 @@
         topological sort, i.e. all parents come before their
         children going forward; the opposite for reverse.
 
-        :param start_revision_id: the revision_id to begin walking from.
+        Args:
+          start_revision_id: the revision_id to begin walking from.
             If None, the branch tip is used.
-        :param stop_revision_id: the revision_id to terminate the walk
+          stop_revision_id: the revision_id to terminate the walk
             after. If None, the rest of history is included.
-        :param stop_rule: if stop_revision_id is not None, the precise rule
+          stop_rule: if stop_revision_id is not None, the precise rule
             to use for termination:
 
             * 'exclude' - leave the stop revision out of the result (default)
@@ -472,7 +480,7 @@
               merged revisions in the result
             * 'with-merges-without-common-ancestry' - filter out revisions
               that are in both ancestries
-        :param direction: either 'reverse' or 'forward':
+          direction: either 'reverse' or 'forward':
 
             * reverse means return the start_revision_id first, i.e.
               start at the most recent revision and go backwards in history
@@ -481,7 +489,7 @@
               ordering w.r.t. depth as some clients of this API may like.
               (If required, that ought to be done at higher layers.)
 
-        :return: an iterator over (revision_id, depth, revno, end_of_merge)
+        Returns: an iterator over (revision_id, depth, revno, end_of_merge)
             tuples where:
 
             * revision_id: the unique id of the revision
@@ -663,8 +671,8 @@
     def bind(self, other):
         """Bind the local branch the other branch.
 
-        :param other: The branch to bind to
-        :type other: Branch
+        Args:
+          other: The branch to bind to
         """
         raise BindingUnsupported(self)
 
@@ -683,11 +691,12 @@
     def fetch(self, from_branch, stop_revision=None, limit=None, lossy=False):
         """Copy revisions from from_branch into this branch.
 
-        :param from_branch: Where to copy from.
-        :param stop_revision: What revision to stop at (None for at the end
+        Args:
+          from_branch: Where to copy from.
+          stop_revision: What revision to stop at (None for at the end
                               of the branch.
-        :param limit: Optional rough limit of revisions to fetch
-        :return: None
+          limit: Optional rough limit of revisions to fetch
+        Returns: None
         """
         with self.lock_write():
             return InterBranch.get(from_branch, self).fetch(
@@ -711,14 +720,15 @@
                            revision_id=None, lossy=False):
         """Obtain a CommitBuilder for this branch.
 
-        :param parents: Revision ids of the parents of the new revision.
-        :param config: Optional configuration to use.
-        :param timestamp: Optional timestamp recorded for commit.
-        :param timezone: Optional timezone for timestamp.
-        :param committer: Optional committer to set for commit.
-        :param revprops: Optional dictionary of revision properties.
-        :param revision_id: Optional revision id.
-        :param lossy: Whether to discard data that can not be natively
+        Args:
+          parents: Revision ids of the parents of the new revision.
+          config: Optional configuration to use.
+          timestamp: Optional timestamp recorded for commit.
+          timezone: Optional timezone for timestamp.
+          committer: Optional committer to set for commit.
+          revprops: Optional dictionary of revision properties.
+          revision_id: Optional revision id.
+          lossy: Whether to discard data that can not be natively
             represented, when pushing to a foreign VCS
         """
 
@@ -732,7 +742,7 @@
     def get_master_branch(self, possible_transports=None):
         """Return the branch we are bound to.
 
-        :return: Either a Branch, or None
+        Returns: Either a Branch, or None
         """
         return None
 
@@ -989,7 +999,7 @@
     def last_revision_info(self) -> Tuple[int, RevisionID]:
         """Return information about the last revision.
 
-        :return: A tuple (revno, revision_id).
+        Returns: A tuple (revno, revision_id).
         """
         with self.lock_read():
             if self._last_revision_info_cache is None:
@@ -1008,12 +1018,13 @@
         the master branch first before updating the tip of the local branch.
         Revisions referenced by source's tags are also transferred.
 
-        :param source: Source branch to optionally fetch from
-        :param revno: Revision number of the new tip
-        :param revid: Revision id of the new tip
-        :param lossy: Whether to discard metadata that can not be
+        Args:
+          source: Source branch to optionally fetch from
+          revno: Revision number of the new tip
+          revid: Revision id of the new tip
+          lossy: Whether to discard metadata that can not be
             natively represented
-        :return: Tuple with the new revision number and revision id
+        Returns: Tuple with the new revision number and revision id
             (should only be different from the arguments when lossy=True)
         """
         if not self.repository.has_same_location(source.repository):
@@ -1052,7 +1063,7 @@
 
         This branch is considered to be 'local', having low latency.
 
-        :returns: PullResult instance
+        Returns: PullResult instance
         """
         return InterBranch.get(source, self).pull(
             overwrite=overwrite, stop_revision=stop_revision,
@@ -1182,7 +1193,7 @@
     def update(self):
         """Synchronise this branch with the master branch if any.
 
-        :return: None or the last_revision pivoted out during the update.
+        Returns: None or the last_revision pivoted out during the update.
         """
         return None
 
@@ -1255,9 +1266,10 @@
         repository contains all the lefthand ancestors of the intended
         last_revision.  If not, set_last_revision_info will fail.
 
-        :param destination: The branch to copy the history into
-        :param revision_id: The revision-id to truncate history at.  May
-          be None to copy complete history.
+        Args:
+          destination: The branch to copy the history into
+          revision_id: The revision-id to truncate history at.  May
+             be None to copy complete history.
         """
         source_revno, source_revision_id = self.last_revision_info()
         if revision_id is None:
@@ -1297,9 +1309,10 @@
 
         Callers will typically also want to check the repository.
 
-        :param refs: Calculated refs for this branch as specified by
+        Args:
+          refs: Calculated refs for this branch as specified by
             branch._get_check_refs()
-        :return: A BranchCheckResult.
+        Returns: A BranchCheckResult.
         """
         with self.lock_read():
             result = BranchCheckResult(self)
@@ -1330,13 +1343,14 @@
                                   tag_selector=None):
         """Create a clone of this branch and its bzrdir.
 
-        :param to_transport: The transport to clone onto.
-        :param revision_id: The revision id to use as tip in the new branch.
+        Args:
+          to_transport: The transport to clone onto.
+          revision_id: The revision id to use as tip in the new branch.
             If None the tip is obtained from this branch.
-        :param stacked_on: An optional URL to stack the clone on.
-        :param create_prefix: Create any missing directories leading up to
+          stacked_on: An optional URL to stack the clone on.
+          create_prefix: Create any missing directories leading up to
             to_transport.
-        :param use_existing_dir: Use an existing directory if one exists.
+          use_existing_dir: Use an existing directory if one exists.
         """
         # XXX: Fix the bzrdir API to allow getting the branch back from the
         # clone call. Or something. 20090224 RBC/spiv.
@@ -1355,18 +1369,19 @@
                         hardlink=False, recurse_nested=True):
         """Create a checkout of a branch.
 
-        :param to_location: The url to produce the checkout at
-        :param revision_id: The revision to check out
-        :param lightweight: If True, produce a lightweight checkout, otherwise,
+        Args:
+          to_location: The url to produce the checkout at
+          revision_id: The revision to check out
+          lightweight: If True, produce a lightweight checkout, otherwise,
             produce a bound branch (heavyweight checkout)
-        :param accelerator_tree: A tree which can be used for retrieving file
+          accelerator_tree: A tree which can be used for retrieving file
             contents more quickly than the revision tree, i.e. a workingtree.
             The revision tree will be used for cases where accelerator_tree's
             content is different.
-        :param hardlink: If true, hard-link files from accelerator_tree,
+          hardlink: If true, hard-link files from accelerator_tree,
             where possible.
-        :param recurse_nested: Whether to recurse into nested trees
-        :return: The tree of the created checkout
+          recurse_nested: Whether to recurse into nested trees
+        Returns: The tree of the created checkout
         """
         t = transport.get_transport(to_location)
         t.ensure_base()
@@ -1419,7 +1434,7 @@
     def reconcile(self, thorough=True):
         """Make sure the data stored in this branch is consistent.
 
-        :return: A `ReconcileResult` object.
+        Returns: A `ReconcileResult` object.
         """
         raise NotImplementedError(self.reconcile)
 
@@ -1429,8 +1444,9 @@
     def automatic_tag_name(self, revision_id):
         """Try to automatically find the tag name for a revision.
 
-        :param revision_id: Revision id of the revision.
-        :return: A tag name or None if no tag name could be determined.
+        Args:
+          revision_id: Revision id of the revision.
+        Returns: A tag name or None if no tag name could be determined.
         """
         for hook in Branch.hooks['automatic_tag_name']:
             ret = hook(self, revision_id)
@@ -1445,7 +1461,7 @@
         This is a helper function for update_revisions.
 
         :raises: DivergedBranches if revision_b has diverged from revision_a.
-        :returns: True if revision_b is a descendant of revision_a.
+        Returns: True if revision_b is a descendant of revision_a.
         """
         relation = self._revision_relations(revision_a, revision_b, graph)
         if relation == 'b_descends_from_a':
@@ -1460,7 +1476,7 @@
     def _revision_relations(self, revision_a, revision_b, graph):
         """Determine the relationship between two revisions.
 
-        :returns: One of: 'a_descends_from_b', 'b_descends_from_a', 'diverged'
+        Returns: One of: 'a_descends_from_b', 'b_descends_from_a', 'diverged'
         """
         heads = graph.heads([revision_a, revision_b])
         if heads == {revision_b}:
@@ -1477,7 +1493,7 @@
         """Return the heads that must and that should be fetched to copy this
         branch into another repo.
 
-        :returns: a 2-tuple of (must_fetch, if_present_fetch).  must_fetch is a
+        Returns: a 2-tuple of (must_fetch, if_present_fetch).  must_fetch is a
             set of heads that must be fetched.  if_present_fetch is a set of
             heads that must be fetched if present, but no error is necessary if
             they are not present.
@@ -1498,7 +1514,7 @@
     def create_memorytree(self):
         """Create a memory tree for this branch.
 
-        :return: An in-memory MutableTree instance
+        Returns: An in-memory MutableTree instance
         """
         from . import memorytree
         return memorytree.MemoryTree.create_on_branch(self)
@@ -1535,9 +1551,10 @@
         this method - it is assumed that the format of the branch
         in controldir is correct.
 
-        :param controldir: The controldir to get the branch data from.
-        :param name: Name of the colocated branch to fetch
-        :return: None if the branch is not a reference branch.
+        Args:
+          controldir: The controldir to get the branch data from.
+          name: Name of the colocated branch to fetch
+        Returns: None if the branch is not a reference branch.
         """
         return None
 
@@ -1549,9 +1566,10 @@
         this method - it is assumed that the format of the branch
         in controldir is correct.
 
-        :param controldir: The controldir to set the branch reference for.
-        :param name: Name of colocated branch to set, None for default
-        :param to_branch: branch that the checkout is to reference
+        Args:
+          controldir: The controldir to set the branch reference for.
+          name: Name of colocated branch to set, None for default
+          to_branch: branch that the checkout is to reference
         """
         raise NotImplementedError(self.set_reference)
 
@@ -1571,7 +1589,8 @@
                    append_revisions_only=None):
         """Create a branch of this format in controldir.
 
-        :param name: Name of the colocated branch to create.
+        Args:
+          name: Name of the colocated branch to create.
         """
         raise NotImplementedError(self.initialize)
 
@@ -1613,11 +1632,12 @@
              found_repository=None, possible_transports=None):
         """Return the branch object for controldir.
 
-        :param controldir: A ControlDir that contains a branch.
-        :param name: Name of colocated branch to open
-        :param _found: a private parameter, do not use it. It is used to
+        Args:
+          controldir: A ControlDir that contains a branch.
+          name: Name of colocated branch to open
+          _found: a private parameter, do not use it. It is used to
             indicate if format probing has already be done.
-        :param ignore_fallbacks: when set, no fallback branches will be opened
+          ignore_fallbacks: when set, no fallback branches will be opened
             (if there are any).  Default is to open fallbacks.
         """
         raise NotImplementedError(self.open)
@@ -1765,11 +1785,12 @@
 
     There are 5 fields that hooks may wish to access:
 
-    :ivar branch: the branch being changed
-    :ivar old_revno: revision number before the change
-    :ivar new_revno: revision number after the change
-    :ivar old_revid: revision id before the change
-    :ivar new_revid: revision id after the change
+    Attributes:
+      branch: the branch being changed
+      old_revno: revision number before the change
+      new_revno: revision number after the change
+      old_revid: revision id before the change
+      new_revid: revision id after the change
 
     The revid fields are strings. The revno fields are integers.
     """
@@ -1777,11 +1798,12 @@
     def __init__(self, branch, old_revno, new_revno, old_revid, new_revid):
         """Create a group of ChangeBranchTip parameters.
 
-        :param branch: The branch being changed.
-        :param old_revno: Revision number before the change.
-        :param new_revno: Revision number after the change.
-        :param old_revid: Tip revision id before the change.
-        :param new_revid: Tip revision id after the change.
+        Args:
+          branch: The branch being changed.
+          old_revno: Revision number before the change.
+          new_revno: Revision number after the change.
+          old_revid: Tip revision id before the change.
+          new_revid: Tip revision id after the change.
         """
         self.branch = branch
         self.old_revno = old_revno
@@ -1803,10 +1825,11 @@
 
     There are 4 fields that hooks may wish to access:
 
-    :ivar format: the branch format
-    :ivar bzrdir: the ControlDir where the branch will be/has been initialized
-    :ivar name: name of colocated branch, if any (or None)
-    :ivar branch: the branch created
+    Attributes:
+      format: the branch format
+      bzrdir: the ControlDir where the branch will be/has been initialized
+      name: name of colocated branch, if any (or None)
+      branch: the branch created
 
     Note that for lightweight checkouts, the bzrdir and format fields refer to
     the checkout, hence they are different from the corresponding fields in
@@ -1816,11 +1839,12 @@
     def __init__(self, format, controldir, name, branch):
         """Create a group of BranchInitHook parameters.
 
-        :param format: the branch format
-        :param controldir: the ControlDir where the branch will be/has been
+        Args:
+          format: the branch format
+          controldir: the ControlDir where the branch will be/has been
             initialized
-        :param name: name of colocated branch, if any (or None)
-        :param branch: the branch created
+          name: name of colocated branch, if any (or None)
+          branch: the branch created
 
         Note that for lightweight checkouts, the bzrdir and format fields refer
         to the checkout, hence they are different from the corresponding fields
@@ -1843,19 +1867,21 @@
 
     There are 4 fields that hooks may wish to access:
 
-    :ivar control_dir: ControlDir of the checkout to change
-    :ivar to_branch: branch that the checkout is to reference
-    :ivar force: skip the check for local commits in a heavy checkout
-    :ivar revision_id: revision ID to switch to (or None)
+    Attributes:
+      control_dir: ControlDir of the checkout to change
+      to_branch: branch that the checkout is to reference
+      force: skip the check for local commits in a heavy checkout
+      revision_id: revision ID to switch to (or None)
     """
 
     def __init__(self, control_dir, to_branch, force, revision_id):
         """Create a group of SwitchHook parameters.
 
-        :param control_dir: ControlDir of the checkout to change
-        :param to_branch: branch that the checkout is to reference
-        :param force: skip the check for local commits in a heavy checkout
-        :param revision_id: revision ID to switch to (or None)
+        Args:
+          control_dir: ControlDir of the checkout to change
+          to_branch: branch that the checkout is to reference
+          force: skip the check for local commits in a heavy checkout
+          revision_id: revision ID to switch to (or None)
         """
         self.control_dir = control_dir
         self.to_branch = to_branch
@@ -1932,9 +1958,10 @@
 class BranchWriteLockResult(LogicalLockResult):
     """The result of write locking a branch.
 
-    :ivar token: The token obtained from the underlying branch lock, or
+    Attributes:
+      token: The token obtained from the underlying branch lock, or
         None.
-    :ivar unlock: A callable which will unlock the lock.
+      unlock: A callable which will unlock the lock.
     """
 
     def __repr__(self):
@@ -1958,17 +1985,18 @@
 class PullResult(_Result):
     """Result of a Branch.pull operation.
 
-    :ivar old_revno: Revision number before pull.
-    :ivar new_revno: Revision number after pull.
-    :ivar old_revid: Tip revision id before pull.
-    :ivar new_revid: Tip revision id after pull.
-    :ivar source_branch: Source (local) branch object. (read locked)
-    :ivar master_branch: Master branch of the target, or the target if no
+    Attributes:
+      old_revno: Revision number before pull.
+      new_revno: Revision number after pull.
+      old_revid: Tip revision id before pull.
+      new_revid: Tip revision id after pull.
+      source_branch: Source (local) branch object. (read locked)
+      master_branch: Master branch of the target, or the target if no
         Master
-    :ivar local_branch: target branch if there is a Master, else None
-    :ivar target_branch: Target/destination branch object. (write locked)
-    :ivar tag_conflicts: A list of tag conflicts, see BasicTags.merge_to
-    :ivar tag_updates: A dict with new tags, see BasicTags.merge_to
+      local_branch: target branch if there is a Master, else None
+      target_branch: Target/destination branch object. (write locked)
+      tag_conflicts: A list of tag conflicts, see BasicTags.merge_to
+      tag_updates: A dict with new tags, see BasicTags.merge_to
     """
 
     def report(self, to_file):
@@ -1990,19 +2018,20 @@
 class BranchPushResult(_Result):
     """Result of a Branch.push operation.
 
-    :ivar old_revno: Revision number (eg 10) of the target before push.
-    :ivar new_revno: Revision number (eg 12) of the target after push.
-    :ivar old_revid: Tip revision id (eg [e-mail]-1234234-aoeua34) of target
+    Attributes:
+      old_revno: Revision number (eg 10) of the target before push.
+      new_revno: Revision number (eg 12) of the target after push.
+      old_revid: Tip revision id (eg [e-mail]-1234234-aoeua34) of target
         before the push.
-    :ivar new_revid: Tip revision id (eg [e-mail]-5676566-boa234a) of target
+      new_revid: Tip revision id (eg [e-mail]-5676566-boa234a) of target
         after the push.
-    :ivar source_branch: Source branch object that the push was from. This is
+      source_branch: Source branch object that the push was from. This is
         read locked, and generally is a local (and thus low latency) branch.
-    :ivar master_branch: If target is a bound branch, the master branch of
+      master_branch: If target is a bound branch, the master branch of
         target, or target itself. Always write locked.
-    :ivar target_branch: The direct Branch where data is being sent (write
+      target_branch: The direct Branch where data is being sent (write
         locked).
-    :ivar local_branch: If the target is a bound branch this will be the
+      local_branch: If the target is a bound branch this will be the
         target, otherwise it will be None.
     """
 
@@ -2035,7 +2064,7 @@
 class BranchCheckResult(object):
     """Results of checking branch consistency.
 
-    :see: Branch.check
+    See `Branch.check`
     """
 
     def __init__(self, branch):
@@ -2045,7 +2074,8 @@
     def report_results(self, verbose):
         """Report the check results via trace.note.
 
-        :param verbose: Requests more detailed display of what was checked,
+        Args:
+          verbose: Requests more detailed display of what was checked,
             if any.
         """
         note(gettext('checked branch {0} format {1}').format(
@@ -2069,7 +2099,7 @@
     def _get_branch_formats_to_test(klass):
         """Return an iterable of format tuples for testing.
 
-        :return: An iterable of (from_format, to_format) to use when testing
+        Returns: An iterable of (from_format, to_format) to use when testing
             this InterBranch class. Each InterBranch class should define this
             method itself.
         """
@@ -2081,7 +2111,7 @@
 
         The target branch is considered to be 'local', having low latency.
 
-        :returns: PullResult instance
+        Returns: PullResult instance
         """
         raise NotImplementedError(self.pull)
 
@@ -2096,10 +2126,11 @@
     def copy_content_into(self, revision_id=None, tag_selector=None):
         """Copy the content of source into target
 
-        :param revision_id:
+        Args:
+          revision_id:
             if not None, the revision history in the new branch will
             be truncated to end with revision_id.
-        :param tag_selector: Optional callback that can decide
+          tag_selector: Optional callback that can decide
             to copy or not copy tags.
         """
         raise NotImplementedError(self.copy_content_into)
@@ -2107,9 +2138,10 @@
     def fetch(self, stop_revision=None, limit=None, lossy=False):
         """Fetch revisions.
 
-        :param stop_revision: Last revision to fetch
-        :param limit: Optional rough limit of revisions to fetch
-        :return: FetchResult object
+        Args:
+          stop_revision: Last revision to fetch
+          limit: Optional rough limit of revisions to fetch
+        Returns: FetchResult object
         """
         raise NotImplementedError(self.fetch)
 
@@ -2229,7 +2261,8 @@
              tag_selector=None):
         """Pull from source into self, updating my master if any.
 
-        :param run_hooks: Private parameter - if false, this branch
+        Args:
+          run_hooks: Private parameter - if false, this branch
             is being called because it's the master of the primary branch,
             so it should not run its hooks.
         """
@@ -2272,7 +2305,8 @@
 
         This is the basic concrete implementation of push()
 
-        :param _override_hook_source_branch: If specified, run the hooks
+        Args:
+          _override_hook_source_branch: If specified, run the hooks
             passing this Branch as the source, rather than self.  This is for
             use of RemoteBranch, where push is delegated to the underlying
             vfs-based Branch.
@@ -2355,16 +2389,17 @@
         This function is the core worker, used by GenericInterBranch.pull to
         avoid duplication when pulling source->master and source->local.
 
-        :param _hook_master: Private parameter - set the branch to
+        Args:
+          _hook_master: Private parameter - set the branch to
             be supplied as the master to pull hooks.
-        :param run_hooks: Private parameter - if false, this branch
-            is being called because it's the master of the primary branch,
-            so it should not run its hooks.
-            is being called because it's the master of the primary branch,
-            so it should not run its hooks.
-        :param _override_hook_target: Private parameter - set the branch to be
+          run_hooks: Private parameter - if false, this branch
+            is being called because it's the master of the primary branch,
+            so it should not run its hooks.
+            is being called because it's the master of the primary branch,
+            so it should not run its hooks.
+          _override_hook_target: Private parameter - set the branch to be
             supplied as the target_branch to pull hooks.
-        :param local: Only update the local branch, and not the bound branch.
+          local: Only update the local branch, and not the bound branch.
         """
         # This type of branch can't be bound.
         if local:

=== modified file 'breezy/bzr/fetch.py'
--- breezy/bzr/fetch.py	2020-02-18 01:57:45 +0000
+++ breezy/bzr/fetch.py	2022-07-09 22:09:46 +0000
@@ -14,6 +14,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
+__docformat__ = "google"
+
 """Copying of history from one branch to another.
 
 The basic plan is that every branch knows the history of everything
@@ -24,16 +26,6 @@
 
 import operator
 
-from ..lazy_import import lazy_import
-lazy_import(globals(), """
-from breezy import (
-    tsort,
-    )
-from breezy.bzr import (
-    versionedfile,
-    vf_search,
-    )
-""")
 from .. import (
     errors,
     ui,
@@ -54,11 +46,12 @@
                  find_ghosts=True, fetch_spec=None):
         """Create a repo fetcher.
 
-        :param last_revision: If set, try to limit to the data this revision
+        Args:
+          last_revision: If set, try to limit to the data this revision
             references.
-        :param fetch_spec: A SearchResult specifying which revisions to fetch.
+          fetch_spec: A SearchResult specifying which revisions to fetch.
             If set, this overrides last_revision.
-        :param find_ghosts: If True search the entire history for ghosts.
+          find_ghosts: If True search the entire history for ghosts.
         """
         # repository.fetch has the responsibility for short-circuiting
         # attempts to copy between a repository and itself.
@@ -144,9 +137,11 @@
         """Determines the exact revisions needed from self.from_repository to
         install self._last_revision in self.to_repository.
 
-        :returns: A SearchResult of some sort.  (Possibly a
-            PendingAncestryResult, EmptySearchResult, etc.)
+        Returns:
+          A SearchResult of some sort.  (Possibly a
+          PendingAncestryResult, EmptySearchResult, etc.)
         """
+        from . import vf_search
         if self._fetch_spec is not None:
             # The fetch spec is already a concrete search result.
             return self._fetch_spec
@@ -177,7 +172,8 @@
     def __init__(self, source):
         """Constructor.
 
-        :param source: The repository data comes from
+        Args:
+          source: The repository data comes from
         """
         self.source = source
 
@@ -189,7 +185,8 @@
         Trees are retrieved in batches of 100, and then yielded in the order
         they were requested.
 
-        :param revs: A list of revision ids
+        Args:
+          revs: A list of revision ids
         """
         # In case that revs is not a list.
         revs = list(revs)
@@ -220,11 +217,13 @@
     def generate_root_texts(self, revs):
         """Generate VersionedFiles for all root ids.
 
-        :param revs: the revisions to include
+        Args:
+          revs: the revisions to include
         """
+        from ..tsort import topo_sort
         graph = self.source.get_graph()
         parent_map = graph.get_parent_map(revs)
-        rev_order = tsort.topo_sort(parent_map)
+        rev_order = topo_sort(parent_map)
         rev_id_to_root_id = self._find_root_ids(revs, parent_map, graph)
         root_id_order = [(rev_id_to_root_id[rev_id], rev_id) for rev_id in
                          rev_order]
@@ -247,21 +246,22 @@
 
     Used in fetches that do rich-root upgrades.
 
-    :param root_keys_to_create: iterable of (root_id, rev_id) pairs describing
+    Args:
+      root_keys_to_create: iterable of (root_id, rev_id) pairs describing
         the root entries to create.
-    :param rev_id_to_root_id_map: dict of known rev_id -> root_id mappings for
+      rev_id_to_root_id_map: dict of known rev_id -> root_id mappings for
         calculating the parents.  If a parent rev_id is not found here then it
         will be recalculated.
-    :param parent_map: a parent map for all the revisions in
+      parent_map: a parent map for all the revisions in
         root_keys_to_create.
-    :param graph: a graph to use instead of repo.get_graph().
+      graph: a graph to use instead of repo.get_graph().
     """
+    from .versionedfile import ChunkedContentFactory
     for root_key in root_keys_to_create:
         root_id, rev_id = root_key
         parent_keys = _parent_keys_for_root_version(
             root_id, rev_id, rev_id_to_root_id_map, parent_map, repo, graph)
-        yield versionedfile.ChunkedContentFactory(
-            root_key, parent_keys, None, [])
+        yield ChunkedContentFactory(root_key, parent_keys, None, [])
 
 
 def _parent_keys_for_root_version(
@@ -351,12 +351,13 @@
      * target is stacked?  (similar to pre-existing target repo: even if
        the target itself is new don't want to refetch existing revs)
 
-    :ivar source_branch: the source branch if one specified, else None.
-    :ivar source_branch_stop_revision_id: fetch up to this revision of
+    Attributes:
+      source_branch: the source branch if one specified, else None.
+      source_branch_stop_revision_id: fetch up to this revision of
         source_branch, rather than its tip.
-    :ivar source_repo: the source repository if one found, else None.
-    :ivar target_repo: the target repository acquired by sprout.
-    :ivar target_repo_kind: one of the TargetRepoKinds constants.
+      source_repo: the source repository if one found, else None.
+      target_repo: the target repository acquired by sprout.
+      target_repo_kind: one of the TargetRepoKinds constants.
     """
 
     def __init__(self):
@@ -374,6 +375,7 @@
 
     def make_fetch_spec(self):
         """Build a SearchResult or PendingAncestryResult or etc."""
+        from . import vf_search
         if self.target_repo_kind is None or self.source_repo is None:
             raise AssertionError(
                 'Incomplete FetchSpecFactory: %r' % (self.__dict__,))

=== modified file 'breezy/bzr/groupcompress.py'
--- breezy/bzr/groupcompress.py	2022-01-09 13:12:27 +0000
+++ breezy/bzr/groupcompress.py	2022-07-09 22:09:46 +0000
@@ -22,18 +22,13 @@
 from ..lazy_import import lazy_import
 lazy_import(globals(), """
 from breezy import (
-    annotate,
-    config,
     debug,
     osutils,
     static_tuple,
-    trace,
     tsort,
     )
 from breezy.bzr import (
     knit,
-    pack,
-    pack_repo,
     )
 
 from breezy.i18n import gettext
@@ -41,6 +36,7 @@
 
 from .. import (
     errors,
+    trace,
     )
 from .btree_index import BTreeBuilder
 from ..lru_cache import LRUSizeCache
@@ -1094,6 +1090,8 @@
     :param delta: Delta compress contents.
     :param keylength: How long should keys be.
     """
+    from .pack import ContainerWriter
+    from .pack_repo import _DirectPackAccess
     def factory(transport):
         parents = graph
         ref_length = 0
@@ -1102,12 +1100,12 @@
         graph_index = BTreeBuilder(reference_lists=ref_length,
                                    key_elements=keylength)
         stream = transport.open_write_stream('newpack')
-        writer = pack.ContainerWriter(stream.write)
+        writer = ContainerWriter(stream.write)
         writer.begin()
         index = _GCGraphIndex(graph_index, lambda: True, parents=parents,
                               add_callback=graph_index.add_nodes,
                               inconsistency_fatal=inconsistency_fatal)
-        access = pack_repo._DirectPackAccess({})
+        access = _DirectPackAccess({})
         access.set_writer(writer, graph_index, (transport, 'newpack'))
         result = GroupCompressVersionedFiles(index, access, delta)
         result.stream = stream
@@ -1368,11 +1366,12 @@
 
     def annotate(self, key):
         """See VersionedFiles.annotate."""
-        ann = annotate.Annotator(self)
+        ann = self.get_annotator()
         return ann.annotate_flat(key)
 
     def get_annotator(self):
-        return annotate.Annotator(self)
+        from ..annotate import Annotator
+        return Annotator(self)
 
     def check(self, progress_bar=None, keys=None):
         """See VersionedFiles.check()."""
@@ -1700,11 +1699,12 @@
             pass
 
     def _get_compressor_settings(self):
+        from ..config import GlobalConfig
         if self._max_bytes_to_index is None:
             # TODO: VersionedFiles don't know about their containing
             #       repository, so they don't have much of an idea about their
             #       location. So for now, this is only a global option.
-            c = config.GlobalConfig()
+            c = GlobalConfig()
             val = c.get_user_option('bzr.groupcompress.max_bytes_to_index')
             if val is not None:
                 try:

=== modified file 'breezy/commands.py'
--- breezy/commands.py	2022-07-02 13:44:01 +0000
+++ breezy/commands.py	2022-07-09 22:09:46 +0000
@@ -21,6 +21,8 @@
 
 # TODO: Specific "examples" property on commands for consistent formatting.
 
+__docformat__ = "google"
+
 import contextlib
 import os
 import sys
@@ -29,6 +31,7 @@
     i18n,
     option,
     osutils,
+    trace,
     )
 
 from .lazy_import import lazy_import
@@ -39,7 +42,6 @@
 from breezy import (
     cmdline,
     debug,
-    trace,
     ui,
     )
 """)
@@ -92,7 +94,8 @@
 class CommandRegistry(registry.Registry):
     """Special registry mapping command names to command classes.
 
-    :ivar overridden_registry: Look in this registry for commands being
+    Attributes:
+      overridden_registry: Look in this registry for commands being
         overridden by this registry.  This can be used to tell plugin commands
         about the builtin they're decorating.
     """
@@ -117,8 +120,9 @@
     def register(self, cmd, decorate=False):
         """Utility function to help register a command
 
-        :param cmd: Command subclass to register
-        :param decorate: If true, allow overriding an existing command
+        Args:
+          cmd: Command subclass to register
+          decorate: If true, allow overriding an existing command
             of the same name; the old command is returned by this function.
             Otherwise it is an error to try to override an existing command.
         """
@@ -150,9 +154,10 @@
     def register_lazy(self, command_name, aliases, module_name):
         """Register a command without loading its module.
 
-        :param command_name: The primary name of the command.
-        :param aliases: A list of aliases for the command.
-        :module_name: The module that the command lives in.
+        Args:
+          command_name: The primary name of the command.
+          aliases: A list of aliases for the command.
+          module_name: The module that the command lives in.
         """
         key = self._get_name(command_name)
         registry.Registry.register_lazy(self, key, module_name, command_name,
@@ -247,8 +252,10 @@
 def guess_command(cmd_name):
     """Guess what command a user typoed.
 
-    :param cmd_name: Command to search for
-    :return: None if no command was found, name of a command otherwise
+    Args:
+      cmd_name: Command to search for
+    Returns:
+      None if no command was found, name of a command otherwise
     """
     names = set()
     for name in all_command_names():
@@ -306,12 +313,17 @@
 def _get_cmd_object(cmd_name, plugins_override=True, check_missing=True):
     """Get a command object.
 
-    :param cmd_name: The name of the command.
-    :param plugins_override: Allow plugins to override builtins.
-    :param check_missing: Look up commands not found in the regular index via
+    Args:
+      cmd_name: The name of the command.
+      plugins_override: Allow plugins to override builtins.
+      check_missing: Look up commands not found in the regular index via
         the get_missing_command hook.
-    :return: A Command object instance
-    :raises KeyError: If no command is found.
+
+    Returns:
+      A Command object instance
+
+    Raises:
+      KeyError: If no command is found.
     """
     # We want only 'ascii' command names, but the user may have typed
     # in a Unicode name. In that case, they should just get a
@@ -357,9 +369,14 @@
 def probe_for_provider(cmd_name):
     """Look for a provider for cmd_name.
 
-    :param cmd_name: The command name.
-    :return: plugin_metadata, provider for getting cmd_name.
-    :raises NoPluginAvailable: When no provider can supply the plugin.
+    Args:
+      cmd_name: The command name.
+
+    Returns:
+      plugin_metadata, provider for getting cmd_name.
+
+    Raises:
+      NoPluginAvailable: When no provider can supply the plugin.
     """
     # look for providers that provide this command but aren't installed
     for provider in command_providers_registry:
@@ -423,9 +440,10 @@
     summary, then a complete description of the command.  A grammar
     description will be inserted.
 
-    :cvar aliases: Other accepted names for this command.
+    Attributes:
+      aliases: Other accepted names for this command.
 
-    :cvar takes_args: List of argument forms, marked with whether they are
+      takes_args: List of argument forms, marked with whether they are
         optional, repeated, etc.  Examples::
 
             ['to_location', 'from_branch?', 'file*']
@@ -434,14 +452,14 @@
         * 'from_branch' is optional
         * 'file' can be specified 0 or more times
 
-    :cvar takes_options: List of options that may be given for this command.
+      takes_options: List of options that may be given for this command.
         These can be either strings, referring to globally-defined options, or
         option objects.  Retrieve through options().
 
-    :cvar hidden: If true, this command isn't advertised.  This is typically
+      hidden: If true, this command isn't advertised.  This is typically
         for commands intended for expert users.
 
-    :cvar encoding_type: Command objects will get a 'outf' attribute, which has
+      encoding_type: Command objects will get a 'outf' attribute, which has
         been setup to properly handle encoding of unicode strings.
         encoding_type determines what will happen when characters cannot be
         encoded:
@@ -455,14 +473,14 @@
         encoding_type = 'exact', then sys.stdout is forced to be a binary
         stream, and line-endings will not mangled.
 
-    :cvar invoked_as:
+      invoked_as:
         A string indicating the real name under which this command was
         invoked, before expansion of aliases.
         (This may be None if the command was constructed and run in-process.)
 
-    :cvar hooks: An instance of CommandHooks.
+      hooks: An instance of CommandHooks.
 
-    :cvar __doc__: The help shown by 'brz help command' for this command.
+      __doc__: The help shown by 'brz help command' for this command.
         This is set by assigning explicitly to __doc__ so that -OO can
         be used::
 
@@ -531,13 +549,14 @@
                       see_also_as_links=False, verbose=True):
         """Return a text string with help for this command.
 
-        :param additional_see_also: Additional help topics to be
+        Args:
+          additional_see_also: Additional help topics to be
             cross-referenced.
-        :param plain: if False, raw help (reStructuredText) is
+          plain: if False, raw help (reStructuredText) is
             returned instead of plain text.
-        :param see_also_as_links: if True, convert items in 'See also'
+          see_also_as_links: if True, convert items in 'See also'
             list to internal links (used by bzr_man rstx generator)
-        :param verbose: if True, display the full help, otherwise
+          verbose: if True, display the full help, otherwise
             leave out the descriptive sections and just display
             usage help (e.g. Purpose, Usage, Options) with a
             message explaining how to obtain full help.
@@ -694,8 +713,12 @@
 
         The list is derived from the content of the _see_also attribute. Any
         duplicates are removed and the result is in lexical order.
-        :param additional_terms: Additional help topics to cross-reference.
-        :return: A list of help topics.
+
+        Args:
+          additional_terms: Additional help topics to cross-reference.
+
+        Returns:
+          A list of help topics.
         """
         see_also = set(getattr(self, '_see_also', []))
         if additional_terms:
@@ -1060,18 +1083,21 @@
 def run_bzr(argv, load_plugins=load_plugins, disable_plugins=disable_plugins):
     """Execute a command.
 
-    :param argv: The command-line arguments, without the program name from
+    Args:
+      argv: The command-line arguments, without the program name from
         argv[0] These should already be decoded. All library/test code calling
         run_bzr should be passing valid strings (don't need decoding).
-    :param load_plugins: What function to call when triggering plugin loading.
+      load_plugins: What function to call when triggering plugin loading.
         This function should take no arguments and cause all plugins to be
         loaded.
-    :param disable_plugins: What function to call when disabling plugin
+      disable_plugins: What function to call when disabling plugin
         loading. This function should take no arguments and cause all plugin
         loading to be prohibited (so that code paths in your application that
         know about some plugins possibly being present will fail to import
         those plugins even if they are installed.)
-    :return: Returns a command exit code or raises an exception.
+
+    Returns:
+      Returns a command exit code or raises an exception.
 
     Special master options: these must come before the command because
     they control how the command is interpreted.
@@ -1273,12 +1299,14 @@
 
     Typically `breezy.initialize` should be called first.
 
-    :param argv: list of unicode command-line arguments similar to sys.argv.
+    Args:
+      argv: list of unicode command-line arguments similar to sys.argv.
         argv[0] is script name usually, it will be ignored.
         Don't pass here sys.argv because this list contains plain strings
         and not unicode; pass None instead.
 
-    :return: exit code of brz command.
+    Returns:
+      exit code of brz command.
     """
     if argv is not None:
         argv = argv[1:]
@@ -1328,9 +1356,12 @@
     def get_topics(self, topic):
         """Search for topic amongst commands.
 
-        :param topic: A topic to search for.
-        :return: A list which is either empty or contains a single
-            Command entry.
+        Args:
+          topic: A topic to search for.
+
+        Returns:
+          A list which is either empty or contains a single
+          Command entry.
         """
         if topic and topic.startswith(self.prefix):
             topic = topic[len(self.prefix):]

=== modified file 'breezy/filters/__init__.py'
--- breezy/filters/__init__.py	2022-07-02 13:44:01 +0000
+++ breezy/filters/__init__.py	2022-07-09 22:09:46 +0000
@@ -14,6 +14,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
+__docformat__ = "google"
+
 """Working tree content filtering support.
 
 A filter consists of a read converter, write converter pair.
@@ -55,8 +57,9 @@
     def __init__(self, reader, writer):
         """Create a filter that converts content while reading and writing.
 
-        :param reader: function for converting convenience to canonical content
-        :param writer: function for converting canonical to convenience content
+        Args:
+          reader: function for converting convenience to canonical content
+          writer: function for converting canonical to convenience content
         """
         self.reader = reader
         self.writer = writer
@@ -71,9 +74,10 @@
     def __init__(self, relpath=None, tree=None):
         """Create a context.
 
-        :param relpath: the relative path or None if this context doesn't
+        Args:
+          relpath: the relative path or None if this context doesn't
            support that information.
-        :param tree: the Tree providing this file or None if this context
+          tree: the Tree providing this file or None if this context
            doesn't support that information.
         """
         self._relpath = relpath
@@ -113,9 +117,11 @@
 def filtered_input_file(f, filters):
     """Get an input file that converts external to internal content.
 
-    :param f: the original input file
-    :param filters: the stack of filters to apply
-    :return: a file-like object, size
+    Args:
+      f: the original input file
+      filters: the stack of filters to apply
+
+    Returns: a file-like object, size
     """
     chunks = [f.read()]
     for filter in filters:
@@ -128,11 +134,13 @@
 def filtered_output_bytes(chunks, filters, context=None):
     """Convert byte chunks from internal to external format.
 
-    :param chunks: an iterator containing the original content
-    :param filters: the stack of filters to apply
-    :param context: a ContentFilterContext object passed to
+    Args:
+      chunks: an iterator containing the original content
+      filters: the stack of filters to apply
+      context: a ContentFilterContext object passed to
         each filter
-    :return: an iterator containing the content to output
+
+    Returns: an iterator containing the content to output
     """
     if filters:
         for filter in reversed(filters):
@@ -144,8 +152,9 @@
 def internal_size_sha_file_byname(name, filters):
     """Get size and sha of internal content given external content.
 
-    :param name: path to file
-    :param filters: the stack of filters to apply
+    Args:
+      name: path to file
+      filters: the stack of filters to apply
     """
     with open(name, 'rb', 65000) as f:
         if filters:
@@ -181,10 +190,11 @@
 def _get_filter_stack_for(preferences):
     """Get the filter stack given a sequence of preferences.
 
-    :param preferences: a sequence of (name,value) tuples where
-      name is the preference name and
-      value is the key into the filter stack map registered
-      for that preference.
+    Args:
+      preferences: a sequence of (name,value) tuples where
+          name is the preference name and
+          value is the key into the filter stack map registered
+          for that preference.
     """
     if preferences is None:
         return []
@@ -216,8 +226,11 @@
       # run tests
       _reset_registry(old)
 
-    :param value: the value to set the registry to or None for an empty one.
-    :return: the existing value before it reset.
+    Args:
+      value: the value to set the registry to or None for an empty one.
+
+    Returns:
+      the existing value before it reset.
     """
     global filter_stacks_registry
     original = filter_stacks_registry

=== modified file 'breezy/option.py'
--- breezy/option.py	2020-06-23 01:02:30 +0000
+++ breezy/option.py	2022-07-09 22:09:46 +0000
@@ -17,6 +17,8 @@
 # TODO: For things like --diff-prefix, we want a way to customize the display
 # of the option argument.
 
+__docformat__ = "google"
+
 import optparse
 import re
 
@@ -136,8 +138,9 @@
 class Option(object):
     """Description of a command line option
 
-    :ivar _short_name: If this option has a single-letter name, this is it.
-    Otherwise None.
+    Attributes:
+      _short_name: If this option has a single-letter name, this is it.
+         Otherwise None.
     """
 
     # The dictionary of standard options. These are always legal.
@@ -153,27 +156,22 @@
                  hidden=False):
         """Make a new command option.
 
-        :param name: regular name of the command, used in the double-dash
+        Args:
+          name: regular name of the command, used in the double-dash
             form and also as the parameter to the command's run()
             method (unless param_name is specified).
-
-        :param help: help message displayed in command help
-
-        :param type: function called to parse the option argument, or
+          help: help message displayed in command help
+          type: function called to parse the option argument, or
             None (default) if this option doesn't take an argument.
-
-        :param argname: name of option argument, if any
-
-        :param short_name: short option code for use with a single -, e.g.
+          argname: name of option argument, if any
+          short_name: short option code for use with a single -, e.g.
             short_name="v" to enable parsing of -v.
-
-        :param param_name: name of the parameter which will be passed to
+          param_name: name of the parameter which will be passed to
             the command's run() method.
-
-        :param custom_callback: a callback routine to be called after normal
+          custom_callback: a callback routine to be called after normal
             processing. The signature of the callback routine is
             (option, name, new_value, parser).
-        :param hidden: If True, the option should be hidden in help and
+          hidden: If True, the option should be hidden in help and
             documentation.
         """
         self.name = name
@@ -323,20 +321,21 @@
         """
         Constructor.
 
-        :param name: The option name.
-        :param help: Help for the option.
-        :param registry: A Registry containing the values
-        :param converter: Callable to invoke with the value name to produce
+        Args:
+          name: The option name.
+          help: Help for the option.
+          registry: A Registry containing the values
+          converter: Callable to invoke with the value name to produce
             the value.  If not supplied, self.registry.get is used.
-        :param value_switches: If true, each possible value is assigned its
+          value_switches: If true, each possible value is assigned its
             own switch.  For example, instead of '--format knit',
             '--knit' can be used interchangeably.
-        :param enum_switch: If true, a switch is provided with the option name,
+          enum_switch: If true, a switch is provided with the option name,
             which takes a value.
-        :param lazy_registry: A tuple of (module name, attribute name) for a
+          lazy_registry: A tuple of (module name, attribute name) for a
             registry to be lazily loaded.
-        :param short_name: The short name for the enum switch, if any
-        :param short_value_switches: A dict mapping values to short names
+          short_name: The short name for the enum switch, if any
+          short_value_switches: A dict mapping values to short names
         """
         Option.__init__(self, name, help, type=self.convert,
                         short_name=short_name)

=== modified file 'breezy/plugin.py'
--- breezy/plugin.py	2022-07-08 22:26:28 +0000
+++ breezy/plugin.py	2022-07-09 22:09:46 +0000
@@ -14,6 +14,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
+__docformat__ = "google"
+
 """Breezy plugin support.
 
 Which plugins to load can be configured by setting these environment variables:
@@ -58,7 +60,8 @@
 
     Future calls to load_plugins() will be ignored.
 
-    :param state: The library state object that records loaded plugins.
+    Args:
+      state: The library state object that records loaded plugins.
     """
     if state is None:
         state = breezy.get_global_state()
@@ -73,9 +76,10 @@
     files (and whatever other extensions are used in the platform,
     such as `*.pyd`).
 
-    :param path: The list of paths to search for plugins.  By default,
+    Args:
+      path: The list of paths to search for plugins.  By default,
         it is populated from the __path__ of the breezy.plugins package.
-    :param state: The library state object that records loaded plugins.
+      state: The library state object that records loaded plugins.
     """
     if state is None:
         state = breezy.get_global_state()
@@ -342,9 +346,12 @@
 
     Includes both those that have loaded, and those that failed to load.
 
-    :param show_paths: If true, include the plugin path.
-    :param state: The library state object to inspect.
-    :returns: Iterator of text lines (including newlines.)
+    Args:
+      show_paths: If true, include the plugin path.
+      state: The library state object to inspect.
+
+    Returns:
+      Iterator of text lines (including newlines.)
     """
     if state is None:
         state = breezy.get_global_state()
@@ -425,8 +432,9 @@
 def _load_plugin_module(name, dir):
     """Load plugin by name.
 
-    :param name: The plugin name in the breezy.plugins namespace.
-    :param dir: The directory the plugin is loaded from for error messages.
+    Args:
+      name: The plugin name in the breezy.plugins namespace.
+      dir: The directory the plugin is loaded from for error messages.
     """
     if _MODULE_PREFIX + name in sys.modules:
         return
@@ -497,9 +505,12 @@
 
         This will not trigger loading of new plugins.
 
-        :param topic: A topic to search for.
-        :return: A list which is either empty or contains a single
-            RegisteredTopic entry.
+        Args:
+          topic: A topic to search for.
+
+        Returns:
+          A list which is either empty or contains a single
+          RegisteredTopic entry.
         """
         if not topic:
             return []
@@ -520,14 +531,16 @@
     def __init__(self, module):
         """Constructor.
 
-        :param module: The module for which help should be generated.
+        Args:
+          module: The module for which help should be generated.
         """
         self.module = module
 
     def get_help_text(self, additional_see_also=None, verbose=True):
         """Return a string with the help for this topic.
 
-        :param additional_see_also: Additional help topics to be
+        Args:
+          additional_see_also: Additional help topics to be
             cross-referenced.
         """
         from . import help_topics
@@ -585,7 +598,8 @@
     def load_plugin_tests(self, loader):
         """Return the adapted plugin's test suite.
 
-        :param loader: The custom loader that should be used to load additional
+        Args:
+          loader: The custom loader that should be used to load additional
             tests.
         """
         if getattr(self.module, 'load_tests', None) is not None:

=== modified file 'breezy/repository.py'
--- breezy/repository.py	2022-07-02 13:44:01 +0000
+++ breezy/repository.py	2022-07-09 22:09:46 +0000
@@ -14,6 +14,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
+__docformat__ = "google"
+
 from .lazy_import import lazy_import
 lazy_import(globals(), """
 import time
@@ -61,8 +63,9 @@
 class FetchResult(object):
     """Result of a fetch operation.
 
-    :ivar revidmap: For lossy fetches, map from source revid to target revid.
-    :ivar total_fetched: Number of revisions fetched
+    Attributes:
+      revidmap: For lossy fetches, map from source revid to target revid.
+      total_fetched: Number of revisions fetched
     """
 
     def __init__(self, total_fetched=None, revidmap=None):
@@ -88,14 +91,15 @@
                  revision_id=None, lossy=False):
         """Initiate a CommitBuilder.
 
-        :param repository: Repository to commit to.
-        :param parents: Revision ids of the parents of the new revision.
-        :param timestamp: Optional timestamp recorded for commit.
-        :param timezone: Optional timezone for timestamp.
-        :param committer: Optional committer to set for commit.
-        :param revprops: Optional dictionary of revision properties.
-        :param revision_id: Optional revision id.
-        :param lossy: Whether to discard data that can not be natively
+        Args:
+          repository: Repository to commit to.
+          parents: Revision ids of the parents of the new revision.
+          timestamp: Optional timestamp recorded for commit.
+          timezone: Optional timezone for timestamp.
+          committer: Optional committer to set for commit.
+          revprops: Optional dictionary of revision properties.
+          revision_id: Optional revision id.
+          lossy: Whether to discard data that can not be natively
             represented, when pushing to a foreign VCS
         """
         self._config_stack = config_stack
@@ -134,7 +138,7 @@
         This includes merge-only changes. It is the core for the --unchanged
         detection in commit.
 
-        :return: True if any changes have occured.
+        Returns: True if any changes have occured.
         """
         raise NotImplementedError(self.any_changes)
 
@@ -158,7 +162,7 @@
     def commit(self, message):
         """Make the actual commit.
 
-        :return: The revision id of the recorded revision.
+        Returns: The revision id of the recorded revision.
         """
         raise NotImplementedError(self.commit)
 
@@ -181,7 +185,7 @@
     def finish_inventory(self):
         """Tell the builder that the inventory is finished.
 
-        :return: The inventory id in the repository, which can be used with
+        Returns: The inventory id in the repository, which can be used with
             repository.get_inventory.
         """
         raise NotImplementedError(self.finish_inventory)
@@ -193,7 +197,8 @@
         they should override this function and raise CannotSetRevisionId
         if _new_revision_id is not None.
 
-        :raises: CannotSetRevisionId
+        Raises:
+          CannotSetRevisionId
         """
         if not self.repository._format.supports_setting_revision_ids:
             if revision_id is not None:
@@ -209,15 +214,16 @@
     def record_iter_changes(self, tree, basis_revision_id, iter_changes):
         """Record a new tree via iter_changes.
 
-        :param tree: The tree to obtain text contents from for changed objects.
-        :param basis_revision_id: The revision id of the tree the iter_changes
+        Args:
+          tree: The tree to obtain text contents from for changed objects.
+          basis_revision_id: The revision id of the tree the iter_changes
             has been generated against. Currently assumed to be the same
             as self.parents[0] - if it is not, errors may occur.
-        :param iter_changes: An iter_changes iterator with the changes to apply
+          iter_changes: An iter_changes iterator with the changes to apply
             to basis_revision_id. The iterator must not include any items with
             a current kind of None - missing items must be either filtered out
             or errored-on beefore record_iter_changes sees the item.
-        :return: A generator of (relpath, fs_hash) tuples for use with
+        Returns: A generator of (relpath, fs_hash) tuples for use with
             tree._observed_sha1.
         """
         raise NotImplementedError(self.record_iter_changes)
@@ -226,9 +232,10 @@
 class RepositoryWriteLockResult(LogicalLockResult):
     """The result of write locking a repository.
 
-    :ivar repository_token: The token obtained from the underlying lock, or
+    Attributes:
+      repository_token: The token obtained from the underlying lock, or
         None.
-    :ivar unlock: A callable which will unlock the lock.
+      unlock: A callable which will unlock the lock.
     """
 
     def __init__(self, unlock, repository_token):
@@ -284,11 +291,10 @@
     def abort_write_group(self, suppress_errors=False):
         """Commit the contents accrued within the current write group.
 
-        :param suppress_errors: if true, abort_write_group will catch and log
+        Args:
+          suppress_errors: if true, abort_write_group will catch and log
             unexpected errors that happen during the abort, rather than
             allowing them to propagate.  Defaults to False.
-
-        :seealso: start_write_group.
         """
         if self._write_group is not self.get_transaction():
             # has an unlock or relock occured ?
@@ -327,7 +333,8 @@
     def add_fallback_repository(self, repository):
         """Add a repository to use for looking up data not held locally.
 
-        :param repository: A repository.
+        Args:
+          repository: A repository.
         """
         raise NotImplementedError(self.add_fallback_repository)
 
@@ -336,7 +343,8 @@
 
         Raise an error if not.
 
-        :param repository: A repository to fallback to.
+        Args:
+          repository: A repository to fallback to.
         """
         return InterRepository._assert_same_model(self, repository)
 
@@ -376,9 +384,10 @@
     def __init__(self, _format, controldir, control_files):
         """instantiate a Repository.
 
-        :param _format: The format of the repository on disk.
-        :param controldir: The ControlDir of the repository.
-        :param control_files: Control files to use for locking, etc.
+        Args:
+          _format: The format of the repository on disk.
+          controldir: The ControlDir of the repository.
+          control_files: Control files to use for locking, etc.
         """
         # In the future we will have a single api for all stores for
         # getting file texts, inventories and revisions, then
@@ -460,15 +469,20 @@
 
         XXX: this docstring is duplicated in many places, e.g. lockable_files.py
 
-        :param token: if this is already locked, then lock_write will fail
+        Args:
+          token: if this is already locked, then lock_write will fail
             unless the token matches the existing lock.
-        :returns: a token if this instance supports tokens, otherwise None.
-        :raises TokenLockingNotSupported: when a token is given but this
+        Returns:
+          a token if this instance supports tokens, otherwise None.
+
+        Raises:
+          TokenLockingNotSupported: when a token is given but this
             instance doesn't support using token locks.
-        :raises MismatchedToken: if the specified token doesn't match the token
+          MismatchedToken: if the specified token doesn't match the token
             of the existing lock.
-        :seealso: start_write_group.
-        :return: A RepositoryWriteLockResult.
+
+        Returns:
+          A RepositoryWriteLockResult.
         """
         locked = self.is_locked()
         token = self.control_files.lock_write(token=token)
@@ -484,7 +498,7 @@
     def lock_read(self):
         """Lock the repository for read operations.
 
-        :return: An object with an unlock method which will release the lock
+        Returns: An object with an unlock method which will release the lock
             obtained.
         """
         locked = self.is_locked()
@@ -519,11 +533,12 @@
     def gather_stats(self, revid=None, committers=None):
         """Gather statistics from a revision id.
 
-        :param revid: The revision id to gather statistics from, if None, then
+        Args:
+          revid: The revision id to gather statistics from, if None, then
             no revision specific statistics are gathered.
-        :param committers: Optional parameter controlling whether to grab
+          committers: Optional parameter controlling whether to grab
             a count of committers from the revision specific statistics.
-        :return: A dictionary of statistics. Currently this contains:
+        Returns: A dictionary of statistics. Currently this contains:
             committers: The number of committers if requested.
             firstrev: A tuple with timestamp, timezone for the penultimate left
                 most ancestor of revid, if revid is not the NULL_REVISION.
@@ -565,7 +580,8 @@
 
         This will include branches inside other branches.
 
-        :param using: If True, list only branches using this repository.
+        Args:
+          using: If True, list only branches using this repository.
         """
         if using and not self.is_shared():
             for branch in self.controldir.list_branches():
@@ -637,7 +653,7 @@
 
         :seealso: start_write_group.
 
-        :return: it may return an opaque hint that can be passed to 'pack'.
+        Returns: it may return an opaque hint that can be passed to 'pack'.
         """
         if self._write_group is not self.get_transaction():
             # has an unlock or relock occured ?
@@ -660,9 +676,12 @@
     def suspend_write_group(self):
         """Suspend a write group.
 
-        :raise UnsuspendableWriteGroup: If the write group can not be
+        Raises:
+          UnsuspendableWriteGroup: If the write group can not be
             suspended.
-        :return: List of tokens
+
+        Returns:
+          List of tokens
         """
         raise errors.UnsuspendableWriteGroup(self)
 
@@ -700,13 +719,14 @@
         either finish the current write group before using fetch, or use
         fetch before starting the write group.
 
-        :param find_ghosts: Find and copy revisions in the source that are
+        Args:
+          find_ghosts: Find and copy revisions in the source that are
             ghosts in the target (and not reachable directly by walking out to
             the first-present revision in target from revision_id).
-        :param revision_id: If specified, all the content needed for this
+          revision_id: If specified, all the content needed for this
             revision ID will be copied to the target.  Fetch will determine for
             itself which content needs to be copied.
-        :return: A FetchResult object
+        Returns: A FetchResult object
         """
         if self.is_in_write_group():
             raise errors.InternalBzrError(
@@ -731,15 +751,16 @@
                            revision_id=None, lossy=False):
         """Obtain a CommitBuilder for this repository.
 
-        :param branch: Branch to commit to.
-        :param parents: Revision ids of the parents of the new revision.
-        :param config_stack: Configuration stack to use.
-        :param timestamp: Optional timestamp recorded for commit.
-        :param timezone: Optional timezone for timestamp.
-        :param committer: Optional committer to set for commit.
-        :param revprops: Optional dictionary of revision properties.
-        :param revision_id: Optional revision id.
-        :param lossy: Whether to discard data that can not be natively
+        Args:
+          branch: Branch to commit to.
+          parents: Revision ids of the parents of the new revision.
+          config_stack: Configuration stack to use.
+          timestamp: Optional timestamp recorded for commit.
+          timezone: Optional timezone for timestamp.
+          committer: Optional committer to set for commit.
+          revprops: Optional dictionary of revision properties.
+          revision_id: Optional revision id.
+          lossy: Whether to discard data that can not be natively
             represented, when pushing to a foreign VCS
         """
         raise NotImplementedError(self.get_commit_builder)
@@ -764,7 +785,7 @@
         Currently no check is made that the format of this repository and
         the bzrdir format are compatible. FIXME RBC 20060201.
 
-        :return: The newly created destination repository.
+        Returns: The newly created destination repository.
         """
         with self.lock_read():
             # TODO: deprecate after 0.16; cloning this with all its settings is
@@ -787,7 +808,7 @@
 
         One can only insert data into a repository inside a write group.
 
-        :return: None.
+        Returns: None.
         """
         if not self.is_write_locked():
             raise errors.NotWriteLocked(self)
@@ -837,8 +858,9 @@
     def has_revisions(self, revision_ids):
         """Probe to find out the presence of multiple revisions.
 
-        :param revision_ids: An iterable of revision_ids.
-        :return: A set of the revision_ids that were present.
+        Args:
+          revision_ids: An iterable of revision_ids.
+        Returns: A set of the revision_ids that were present.
         """
         raise NotImplementedError(self.has_revisions)
 
@@ -873,11 +895,12 @@
     def iter_revisions(self, revision_ids):
         """Iterate over revision objects.
 
-        :param revision_ids: An iterable of revisions to examine. None may be
+        Args:
+          revision_ids: An iterable of revisions to examine. None may be
             passed to request all revisions known to the repository. Note that
             not all repositories can find unreferenced revisions; for those
             repositories only referenced ones will be returned.
-        :return: An iterator of (revid, revision) tuples. Absent revisions (
+        Returns: An iterator of (revid, revision) tuples. Absent revisions (
             those asked for but not available) are returned as (revid, None).
             N.B.: Revisions are not necessarily yielded in order.
         """
@@ -902,7 +925,8 @@
 
         specific_files should exist in the first revision.
 
-        :param specific_files: if not None, the result is filtered
+        Args:
+          specific_files: if not None, the result is filtered
           so that only those files, their parents and their
           children are included.
         """
@@ -937,8 +961,9 @@
     def add_signature_text(self, revision_id, signature):
         """Store a signature text for a revision.
 
-        :param revision_id: Revision id of the revision
-        :param signature: Signature text.
+        Args:
+          revision_id: Revision id of the revision
+          signature: Signature text.
         """
         raise NotImplementedError(self.add_signature_text)
 
@@ -953,7 +978,8 @@
         uniquely identify the file version in the caller's context.  (Examples:
         an index number or a TreeTransform trans_id.)
 
-        :param desired_files: a list of (file_id, revision_id, identifier)
+        Args:
+          desired_files: a list of (file_id, revision_id, identifier)
             triples
         """
         raise NotImplementedError(self.iter_files_bytes)
@@ -962,7 +988,7 @@
         """Return the revision id of a revno, given a later (revno, revid)
         pair in the same history.
 
-        :return: if found (True, revid).  If the available history ran out
+        Returns: if found (True, revid).  If the available history ran out
             before reaching the revno, then this returns
             (False, (closest_revno, closest_revid)).
         """
@@ -1023,7 +1049,8 @@
     def revision_trees(self, revision_ids):
         """Return Trees for revisions in this repository.
 
-        :param revision_ids: a sequence of revision-ids;
+        Args:
+          revision_ids: a sequence of revision-ids;
           a revision-id may not be None or b'null:'
         """
         raise NotImplementedError(self.revision_trees)
@@ -1038,14 +1065,15 @@
         self.write_lock as this is a long running call it's reasonable to
         implicitly lock for the user.
 
-        :param hint: If not supplied, the whole repository is packed.
+        Args:
+          hint: If not supplied, the whole repository is packed.
             If supplied, the repository may use the hint parameter as a
             hint for the parts of the repository to pack. A hint can be
             obtained from the result of commit_write_group(). Out of
             date hints are simply ignored, because concurrent operations
             can obsolete them rapidly.
 
-        :param clean_obsolete_packs: Clean obsolete packs immediately after
+          clean_obsolete_packs: Clean obsolete packs immediately after
             the pack operation.
         """
 
@@ -1114,7 +1142,9 @@
         This only applies to branches that use this repository.
 
         The default is 'True'.
-        :param new_value: True to restore the default, False to disable making
+
+        Args:
+          new_value: True to restore the default, False to disable making
                           working trees.
         """
         raise NotImplementedError(self.set_make_working_trees)
@@ -1129,19 +1159,23 @@
     def verify_revision_signature(self, revision_id, gpg_strategy):
         """Verify the signature on a revision.
 
-        :param revision_id: the revision to verify
-        :gpg_strategy: the GPGStrategy object to used
+        Args:
+          revision_id: the revision to verify
+          gpg_strategy: the GPGStrategy object to used
 
-        :return: gpg.SIGNATURE_VALID or a failed SIGNATURE_ value
+        Returns: gpg.SIGNATURE_VALID or a failed SIGNATURE_ value
         """
         raise NotImplementedError(self.verify_revision_signature)
 
     def verify_revision_signatures(self, revision_ids, gpg_strategy):
         """Verify revision signatures for a number of revisions.
 
-        :param revision_id: the revision to verify
-        :gpg_strategy: the GPGStrategy object to used
-        :return: Iterator over tuples with revision id, result and keys
+        Args:
+          revision_id: the revision to verify
+          gpg_strategy: the GPGStrategy object to used
+
+        Returns:
+          Iterator over tuples with revision id, result and keys
         """
         with self.lock_read():
             for revid in revision_ids:
@@ -1161,12 +1195,13 @@
 
         Different repository implementations should override _check().
 
-        :param revision_ids: A non-empty list of revision_ids whose ancestry
+        Args:
+          revision_ids: A non-empty list of revision_ids whose ancestry
              will be checked.  Typically the last revision_id of a branch.
-        :param callback_refs: A dict of check-refs to resolve and callback
+          callback_refs: A dict of check-refs to resolve and callback
             the check/_check method on the items listed as wanting the ref.
             see breezy.check.
-        :param check_repo: If False do not check the repository contents, just
+          check_repo: If False do not check the repository contents, just
             calculate the data callback_refs requires and call them back.
         """
         return self._check(revision_ids=revision_ids, callback_refs=callback_refs,
@@ -1349,9 +1384,12 @@
     def initialize(self, controldir, shared=False):
         """Initialize a repository of this format in controldir.
 
-        :param controldir: The controldir to put the new repository in it.
-        :param shared: The repository should be initialized as a sharable one.
-        :returns: The new repository object.
+        Args:
+          controldir: The controldir to put the new repository in it.
+          shared: The repository should be initialized as a sharable one.
+
+        Returns:
+          The new repository object.
 
         This may raise UninitializableFormat if shared repository are not
         compatible the controldir.
@@ -1522,7 +1560,8 @@
         This is a destructive operation! Do not use it on existing
         repositories.
 
-        :param revision_id: Only copy the content needed to construct
+        Args:
+          revision_id: Only copy the content needed to construct
                             revision_id and its parents.
         """
         with self.lock_write():
@@ -1538,9 +1577,10 @@
 
         The content is copied from self.source to self.target.
 
-        :param revision_id: if None all content is copied, if NULL_REVISION no
+        Args:
+          revision_id: if None all content is copied, if NULL_REVISION no
                             content is copied.
-        :return: FetchResult
+        Returns: FetchResult
         """
         raise NotImplementedError(self.fetch)
 
@@ -1549,18 +1589,19 @@
             limit=None):
         """Return the revision ids that source has that target does not.
 
-        :param revision_ids: return revision ids included by these
+        Args:
+          revision_ids: return revision ids included by these
             revision_ids.  NoSuchRevision will be raised if any of these
             revisions are not present.
-        :param if_present_ids: like revision_ids, but will not cause
+          if_present_ids: like revision_ids, but will not cause
             NoSuchRevision if any of these are absent, instead they will simply
             not be in the result.  This is useful for e.g. finding revisions
             to fetch for tags, which may reference absent revisions.
-        :param find_ghosts: If True find missing revisions in deep history
+          find_ghosts: If True find missing revisions in deep history
             rather than just finding the surface difference.
-        :param limit: Maximum number of revisions to return, topologically
+          limit: Maximum number of revisions to return, topologically
             ordered
-        :return: A breezy.graph.SearchResult.
+        Returns: A breezy.graph.SearchResult.
         """
         raise NotImplementedError(self.search_missing_revision_ids)
 
@@ -1598,15 +1639,17 @@
     def __init__(self, target_format):
         """Create a CopyConverter.
 
-        :param target_format: The format the resulting repository should be.
+        Args:
+          target_format: The format the resulting repository should be.
         """
         self.target_format = target_format
 
     def convert(self, repo, pb):
         """Perform the conversion of to_convert, giving feedback via pb.
 
-        :param to_convert: The disk object to convert.
-        :param pb: a progress bar to use for progress information.
+        Args:
+          to_convert: The disk object to convert.
+          pb: a progress bar to use for progress information.
         """
         with ui.ui_factory.nested_progress_bar() as pb:
             self.count = 0
@@ -1654,9 +1697,10 @@
     encountered.  Otherwise, stop when the beginning of history is
     reached.
 
-    :param stop_index: The index which should be present.  When it is
+    Args:
+      stop_index: The index which should be present.  When it is
         present, history extension will stop.
-    :param stop_revision: The revision id which should be present.  When
+      stop_revision: The revision id which should be present.  When
         it is encountered, history extension will stop.
     """
     start_revision = partial_history_cache[-1]

=== modified file 'breezy/workingtree.py'
--- breezy/workingtree.py	2022-07-09 22:09:46 +0000
+++ breezy/workingtree.py	2022-07-09 22:09:46 +0000
@@ -41,13 +41,13 @@
 import stat
 
 from breezy import (
-    revision as _mod_revision,
     views,
     )
 """)
 
 from . import (
     errors,
+    revision as _mod_revision,
     )
 from .controldir import (
     ControlComponent,