Fix style.

diff --git a/dulwich/client.py b/dulwich/client.py
index fa78719db8877175750582df701f2980c4d914ad..3d8646827e5a5da62fda8446104523ad6678dfe8 100644 (file)
--- a/dulwich/client.py
+++ b/dulwich/client.py
@@ -593,12 +593,12 @@ class GitClient(object):
         for want in wants[1:]:
             proto.write_pkt_line(COMMAND_WANT + b' ' + want + b'\n')
         if depth not in (0, None) or getattr(graph_walker, 'shallow', None):
-            if not CAPABILITY_SHALLOW in capabilities:
+            if CAPABILITY_SHALLOW not in capabilities:
                 raise GitProtocolError(
                     "server does not support shallow capability required for "
                     "depth")
-            for obj_id in graph_walker.shallow:
-                proto.write_pkt_line(COMMAND_SHALLOW + b' ' + shallow + b'\n')
+            for sha in graph_walker.shallow:
+                proto.write_pkt_line(COMMAND_SHALLOW + b' ' + sha + b'\n')
             proto.write_pkt_line(b'%s %d\n' % (COMMAND_DEEPEN, depth))
             proto.write_pkt_line(None)
             if can_read is not None:
@@ -838,7 +838,8 @@ class TraditionalGitClient(GitClient):
             self._handle_upload_pack_tail(
                 proto, negotiated_capabilities, graph_walker, pack_data,
                 progress)
-            return FetchPackResult(refs, symrefs, agent, new_shallow, new_unshallow)
+            return FetchPackResult(
+                    refs, symrefs, agent, new_shallow, new_unshallow)
 
     def get_refs(self, path):
         """Retrieve the current refs from a git smart server."""
@@ -1656,11 +1657,13 @@ class HttpGitClient(GitClient):
         try:
             resp_proto = Protocol(read, None)
             if new_shallow is None and new_unshallow is None:
-                (new_shallow, new_unshallow) = _read_shallow_updates(resp_proto)
+                (new_shallow, new_unshallow) = _read_shallow_updates(
+                        resp_proto)
             self._handle_upload_pack_tail(
                 resp_proto, negotiated_capabilities, graph_walker, pack_data,
                 progress)
-            return FetchPackResult(refs, symrefs, agent, new_shallow, new_unshallow)
+            return FetchPackResult(
+                    refs, symrefs, agent, new_shallow, new_unshallow)
         finally:
             resp.close()
 

diff --git a/dulwich/porcelain.py b/dulwich/porcelain.py
index 17aa3723480ed84b595f80801a48a4ddd226efa7..5b72bab980902b677b97e44f0e064ec8ac53fd4b 100644 (file)
--- a/dulwich/porcelain.py
+++ b/dulwich/porcelain.py
@@ -1087,7 +1087,8 @@ def branch_list(repo):
 
 
 def fetch(repo, remote_location, remote_name=b'origin', outstream=sys.stdout,
-          errstream=default_bytes_err_stream, message=None, depth=None, **kwargs):
+          errstream=default_bytes_err_stream, message=None, depth=None,
+          **kwargs):
     """Fetch objects from a remote server.
 
     :param repo: Path to the repository

diff --git a/dulwich/tests/test_repository.py b/dulwich/tests/test_repository.py
index 4a5bcf22317b2ee6270928c0647fe114083bf794..6a2e0e73629f7d7c4344c2d2d5cf3f401b9c5c6f 100644 (file)
--- a/dulwich/tests/test_repository.py
+++ b/dulwich/tests/test_repository.py
@@ -672,12 +672,15 @@ class BuildRepoRootTests(TestCase):
     def test_update_shallow(self):
         self._repo.update_shallow(None, None)  # no op
         self.assertEquals(set(), self._repo.get_shallow())
-        self._repo.update_shallow([b'a90fa2d900a17e99b433217e988c4eb4a2e9a097'],
-                                  None)
-        self.assertEqual({b'a90fa2d900a17e99b433217e988c4eb4a2e9a097'},
-                         self._repo.get_shallow())
-        self._repo.update_shallow([b'a90fa2d900a17e99b433217e988c4eb4a2e9a097'],
-                                  [b'f9e39b120c68182a4ba35349f832d0e4e61f485c'])
+        self._repo.update_shallow(
+                [b'a90fa2d900a17e99b433217e988c4eb4a2e9a097'],
+                None)
+        self.assertEqual(
+                {b'a90fa2d900a17e99b433217e988c4eb4a2e9a097'},
+                self._repo.get_shallow())
+        self._repo.update_shallow(
+                [b'a90fa2d900a17e99b433217e988c4eb4a2e9a097'],
+                [b'f9e39b120c68182a4ba35349f832d0e4e61f485c'])
         self.assertEqual({b'a90fa2d900a17e99b433217e988c4eb4a2e9a097'},
                          self._repo.get_shallow())