Rev 1621: Fix more formatting. in http://people.samba.org/bzr/jelmer/bzr-svn/trunk

Jelmer Vernooij jelmer at samba.org
Sat Aug 23 18:55:28 BST 2008


At http://people.samba.org/bzr/jelmer/bzr-svn/trunk

------------------------------------------------------------
revno: 1621
revision-id: jelmer at samba.org-20080823175526-l148bu2p1noevmbt
parent: jelmer at samba.org-20080823154306-1a7dhe1t7og0jrlg
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sat 2008-08-23 19:55:26 +0200
message:
  Fix more formatting.
modified:
  logwalker.py                   logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
  properties.py                  util.py-20080502170127-o220e9py99vt69s6-1
  tags.py                        tags.py-20080822211316-scblu3akdvu0b64c-1
  tests/test_config.py           test_config.py-20070624193244-itvnst60evjidr4z-1
  tests/test_convert.py          test_convert.py-20060705203611-b1l0bapeku6foco0-1
  tests/test_fileids.py          test_fileids.py-20060622131341-19gyrlgqy8yl2od5-1
  tests/test_logwalker.py        test_logwalker.py-20060622141944-pkocc3rj8g62ukbi-1
  tests/test_mapping.py          test_mapping.py-20080201131338-0zd86eznn4bojtee-1
  tests/test_properties.py       test_properties.py-20080703215223-t5ydp87wwi7dtyas-1
  tests/test_versionedfiles.py   test_versionedfiles.-20080626153242-v0c6uolklpux67a1-1
  transport.py                   transport.py-20060406231150-b3472d06b3a0818d
  versionedfiles.py              versionedfiles.py-20080626134117-j8g0ntz1pj228iox-1
=== modified file 'logwalker.py'
--- a/logwalker.py	2008-08-23 15:43:06 +0000
+++ b/logwalker.py	2008-08-23 17:55:26 +0000
@@ -211,7 +211,7 @@
         """
         result = self.cachedb.execute("select name, value from revprop where rev = ?", (revnum,))
         revprops = {}
-        for k,v in result:
+        for k, v in result:
             revprops[k.encode("utf-8")] = v.encode("utf-8")
         return revprops
 
@@ -227,7 +227,7 @@
     def insert_revprops(self, revision, revprops):
         if revprops is None:
             return
-        for k,v in revprops.items():
+        for k, v in revprops.items():
             self.insert_revprop(revision, k, v)
 
     def has_all_revprops(self, revnum):
@@ -477,7 +477,7 @@
 def struct_revpaths_to_tuples(changed_paths):
     assert isinstance(changed_paths, dict)
     revpaths = {}
-    for k,(action, copyfrom_path, copyfrom_rev) in changed_paths.items():
+    for k, (action, copyfrom_path, copyfrom_rev) in changed_paths.items():
         if copyfrom_path is None:
             copyfrom_path = None
         else:
@@ -602,7 +602,7 @@
                     if num == ERR_FS_NOT_DIRECTORY:
                         continue
                     raise
-                for k,v in dirents.items():
+                for k, v in dirents.items():
                     childp = urlutils.join(nextp, k)
                     if v['kind'] == core.NODE_DIR:
                         unchecked_dirs.add(childp)

=== modified file 'properties.py'
--- a/properties.py	2008-08-09 02:56:27 +0000
+++ b/properties.py	2008-08-23 17:55:26 +0000
@@ -106,7 +106,7 @@
 def parse_mergeinfo_property(text):
     ret = {}
     for l in text.splitlines():
-        (path, ranges) = l.rsplit(":",1)
+        (path, ranges) = l.rsplit(":", 1)
         assert path.startswith("/")
         ret[path] = []
         for range in ranges.split(","):

=== modified file 'tags.py'
--- a/tags.py	2008-08-23 14:55:24 +0000
+++ b/tags.py	2008-08-23 17:55:26 +0000
@@ -95,7 +95,7 @@
 
     def _set_tag_dict(self, dest_dict):
         cur_dict = self.get_tag_dict()
-        for k,v in dest_dict.iteritems():
+        for k, v in dest_dict.iteritems():
             if cur_dict.get(k) != v:
                 self.set_tag(k, v)
         for k in cur_dict:

=== modified file 'tests/test_config.py'
--- a/tests/test_config.py	2008-07-09 00:06:53 +0000
+++ b/tests/test_config.py	2008-08-23 17:55:26 +0000
@@ -70,7 +70,7 @@
         c.set_user_option("override-svn-revprops", "False")
         self.assertEquals([], c.get_override_svn_revprops())
         c.set_user_option("override-svn-revprops", ["svn:author", "svn:date"])
-        self.assertEquals(["svn:author","svn:date"], c.get_override_svn_revprops())
+        self.assertEquals(["svn:author", "svn:date"], c.get_override_svn_revprops())
         c.set_user_option("override-svn-revprops", ["svn:author"])
         self.assertEquals(["svn:author"], c.get_override_svn_revprops())
 

=== modified file 'tests/test_convert.py'
--- a/tests/test_convert.py	2008-08-23 15:14:26 +0000
+++ b/tests/test_convert.py	2008-08-23 17:55:26 +0000
@@ -80,7 +80,7 @@
         dc.close()
 
     def get_commit_editor(self):
-        return super(TestConversion,self).get_commit_editor(self.repos_url)
+        return super(TestConversion, self).get_commit_editor(self.repos_url)
 
     def test_sets_parent_urls(self):
         convert_repository(Repository.open(self.repos_url), "e", 

=== modified file 'tests/test_fileids.py'
--- a/tests/test_fileids.py	2008-08-08 22:50:51 +0000
+++ b/tests/test_fileids.py	2008-08-23 17:55:26 +0000
@@ -196,7 +196,7 @@
                     return renames[r][x]
                 return self.mapping.generate_file_id("uuid", revnum, branchpath, x)
             revmap = simple_apply_changes(new_file_id, mappings[r], find_children)
-            map.update(dict([(x, (revmap[x],r)) for x in revmap]))
+            map.update(dict([(x, (revmap[x], r)) for x in revmap]))
         return map
 
     def test_simple(self):

=== modified file 'tests/test_logwalker.py'
--- a/tests/test_logwalker.py	2008-07-21 20:46:23 +0000
+++ b/tests/test_logwalker.py	2008-08-23 17:55:26 +0000
@@ -378,7 +378,7 @@
 
         for (paths, rev, revprops) in walker.iter_changes([""], 1):
             self.assertTrue(rev == 0 or paths.has_key("foo"))
-            self.assertTrue(rev in (0,1))
+            self.assertTrue(rev in (0, 1))
 
     def test_follow_history_nohist(self):
         repos_url = self.make_repository("a")
@@ -397,7 +397,7 @@
 
         for (paths, rev, revprops) in walker.iter_changes([""], 1):
             self.assertTrue(rev == 0 or paths.has_key("foo"))
-            self.assertTrue(rev in (0,1))
+            self.assertTrue(rev in (0, 1))
 
         iter = walker.iter_changes([""], 2)
         self.assertRaises(NoSuchRevision, list, iter)

=== modified file 'tests/test_mapping.py'
--- a/tests/test_mapping.py	2008-08-23 15:14:26 +0000
+++ b/tests/test_mapping.py	2008-08-23 17:55:26 +0000
@@ -218,12 +218,12 @@
                 self.mapping.generate_revision_id("myuuid", 5, "bla")))
 
 
-class Mappingv1Tests(MappingTestAdapter,TestCase):
+class Mappingv1Tests(MappingTestAdapter, TestCase):
     def setUp(self):
         self.mapping = BzrSvnMappingv1()
 
 
-class Mappingv2Tests(MappingTestAdapter,TestCase):
+class Mappingv2Tests(MappingTestAdapter, TestCase):
     def setUp(self):
         self.mapping = BzrSvnMappingv2()
 
@@ -232,7 +232,7 @@
     return sha.new(text).hexdigest()
 
 
-class Mappingv3FilePropTests(MappingTestAdapter,TestCase):
+class Mappingv3FilePropTests(MappingTestAdapter, TestCase):
     def setUp(self):
         self.mapping = BzrSvnMappingv3FileProps(NoBranchingScheme())
 
@@ -296,17 +296,17 @@
                 self.mapping.generate_file_id("uuid", 2, u"\xe6".encode('utf-8'), u"\xe6\xf8\xe5"))
 
 
-class Mappingv3RevPropTests(MappingTestAdapter,TestCase):
+class Mappingv3RevPropTests(MappingTestAdapter, TestCase):
     def setUp(self):
         self.mapping = BzrSvnMappingv3RevProps(NoBranchingScheme())
 
 
-class Mappingv3HybridTests(MappingTestAdapter,TestCase):
+class Mappingv3HybridTests(MappingTestAdapter, TestCase):
     def setUp(self):
         self.mapping = BzrSvnMappingv3Hybrid(NoBranchingScheme())
 
 
-class Mappingv4TestAdapter(MappingTestAdapter,TestCase):
+class Mappingv4TestAdapter(MappingTestAdapter, TestCase):
     def setUp(self):
         self.mapping = BzrSvnMappingv4()
 

=== modified file 'tests/test_properties.py'
--- a/tests/test_properties.py	2008-08-23 15:14:26 +0000
+++ b/tests/test_properties.py	2008-08-23 17:55:26 +0000
@@ -98,13 +98,13 @@
 
 class MergeInfoPropertyParserTests(TestCase):
     def test_simple_range(self):
-        self.assertEquals({"/trunk": [(1,2,True)]}, properties.parse_mergeinfo_property("/trunk:1-2\n"))
+        self.assertEquals({"/trunk": [(1, 2, True)]}, properties.parse_mergeinfo_property("/trunk:1-2\n"))
 
     def test_simple_range_uninheritable(self):
-        self.assertEquals({"/trunk": [(1,2,False)]}, properties.parse_mergeinfo_property("/trunk:1-2*\n"))
+        self.assertEquals({"/trunk": [(1, 2, False)]}, properties.parse_mergeinfo_property("/trunk:1-2*\n"))
 
     def test_simple_individual(self):
-        self.assertEquals({"/trunk": [(1,1,True)]}, properties.parse_mergeinfo_property("/trunk:1\n"))
+        self.assertEquals({"/trunk": [(1, 1, True)]}, properties.parse_mergeinfo_property("/trunk:1\n"))
 
     def test_empty(self):
         self.assertEquals({}, properties.parse_mergeinfo_property(""))
@@ -112,10 +112,10 @@
 
 class MergeInfoPropertyCreatorTests(TestCase):
     def test_simple_range(self):
-        self.assertEquals("/trunk:1-2\n", properties.generate_mergeinfo_property({"/trunk": [(1,2,True)]}))
+        self.assertEquals("/trunk:1-2\n", properties.generate_mergeinfo_property({"/trunk": [(1, 2, True)]}))
 
     def test_simple_individual(self):
-        self.assertEquals("/trunk:1\n", properties.generate_mergeinfo_property({"/trunk": [(1,1,True)]}))
+        self.assertEquals("/trunk:1\n", properties.generate_mergeinfo_property({"/trunk": [(1, 1, True)]}))
 
     def test_empty(self):
         self.assertEquals("", properties.generate_mergeinfo_property({}))
@@ -123,42 +123,42 @@
 
 class RevnumRangeTests(TestCase):
     def test_add_revnum_empty(self):
-        self.assertEquals([(1,1,True)], properties.range_add_revnum([], 1))
+        self.assertEquals([(1, 1, True)], properties.range_add_revnum([], 1))
 
     def test_add_revnum_before(self):
-        self.assertEquals([(2,2,True), (8,8,True)], properties.range_add_revnum([(2,2,True)], 8))
+        self.assertEquals([(2, 2, True), (8, 8, True)], properties.range_add_revnum([(2, 2, True)], 8))
 
     def test_add_revnum_included(self):
-        self.assertEquals([(1,3,True)], properties.range_add_revnum([(1,3,True)], 2))
+        self.assertEquals([(1, 3, True)], properties.range_add_revnum([(1, 3, True)], 2))
         
     def test_add_revnum_after(self):
-        self.assertEquals([(1,3,True),(5,5,True)], properties.range_add_revnum([(1,3,True)], 5))
+        self.assertEquals([(1, 3, True), (5, 5, True)], properties.range_add_revnum([(1, 3, True)], 5))
 
     def test_add_revnum_extend_before(self):
-        self.assertEquals([(1,3,True)], properties.range_add_revnum([(2,3,True)], 1))
+        self.assertEquals([(1, 3, True)], properties.range_add_revnum([(2, 3, True)], 1))
 
     def test_add_revnum_extend_after(self):
-        self.assertEquals([(1,3,True)], properties.range_add_revnum([(1,2,True)], 3))
+        self.assertEquals([(1, 3, True)], properties.range_add_revnum([(1, 2, True)], 3))
 
     def test_revnum_includes_empty(self):
         self.assertFalse(properties.range_includes_revnum([], 2))
 
     def test_revnum_includes_oor(self):
-        self.assertFalse(properties.range_includes_revnum([(1,3,True), (4,5, True)], 10))
+        self.assertFalse(properties.range_includes_revnum([(1, 3, True), (4, 5, True)], 10))
 
     def test_revnum_includes_in(self):
-        self.assertTrue(properties.range_includes_revnum([(1,3,True), (4,5, True)], 2))
+        self.assertTrue(properties.range_includes_revnum([(1, 3, True), (4, 5, True)], 2))
 
 
 class MergeInfoIncludeTests(TestCase):
     def test_includes_individual(self):
-        self.assertTrue(properties.mergeinfo_includes_revision({"/trunk": [(1,1,True)]}, "/trunk", 1))
+        self.assertTrue(properties.mergeinfo_includes_revision({"/trunk": [(1, 1, True)]}, "/trunk", 1))
 
     def test_includes_range(self):
-        self.assertTrue(properties.mergeinfo_includes_revision({"/trunk": [(1,5,True)]}, "/trunk", 3))
+        self.assertTrue(properties.mergeinfo_includes_revision({"/trunk": [(1, 5, True)]}, "/trunk", 3))
 
     def test_includes_invalid_path(self):
-        self.assertFalse(properties.mergeinfo_includes_revision({"/somepath": [(1,5,True)]}, "/trunk", 3))
+        self.assertFalse(properties.mergeinfo_includes_revision({"/somepath": [(1, 5, True)]}, "/trunk", 3))
 
     def test_includes_invalid_revnum(self):
-        self.assertFalse(properties.mergeinfo_includes_revision({"/trunk": [(1,5,True)]}, "/trunk", 30))
+        self.assertFalse(properties.mergeinfo_includes_revision({"/trunk": [(1, 5, True)]}, "/trunk", 30))

=== modified file 'tests/test_versionedfiles.py'
--- a/tests/test_versionedfiles.py	2008-08-23 15:14:26 +0000
+++ b/tests/test_versionedfiles.py	2008-08-23 17:55:26 +0000
@@ -37,12 +37,12 @@
                           [])
 
 
-class SvnTextsTests(TestCase,BasicSvnTextsTests):
+class SvnTextsTests(TestCase, BasicSvnTextsTests):
     def setUp(self):
         self.texts = SvnTexts(self)
 
 
-class VirtualRevisionTextsTests(TestCase,BasicSvnTextsTests):
+class VirtualRevisionTextsTests(TestCase, BasicSvnTextsTests):
     def _make_parents_provider(self):
         return self
 
@@ -53,7 +53,7 @@
         raise NotImplementedError
 
 
-class VirtualInventoryTextsTests(TestCase,BasicSvnTextsTests):
+class VirtualInventoryTextsTests(TestCase, BasicSvnTextsTests):
     def _make_parents_provider(self):
         return self
 
@@ -70,7 +70,7 @@
         self.assertEquals({("A",): osutils.sha_strings(["FOO"])}, self.texts.get_sha1s([("A",)]))
 
 
-class VirtualSignatureTextsTests(TestCase,BasicSvnTextsTests):
+class VirtualSignatureTextsTests(TestCase, BasicSvnTextsTests):
     def _make_parents_provider(self):
         return self
 

=== modified file 'transport.py'
--- a/transport.py	2008-08-23 15:14:26 +0000
+++ b/transport.py	2008-08-23 17:55:26 +0000
@@ -308,7 +308,7 @@
         else:
             newpaths = [self._request_path(path) for path in paths]
         
-        fetcher = logfetcher(self, paths=newpaths, start=from_revnum, end=to_revnum, limit=limit, discover_changed_paths=discover_changed_paths, strict_node_history=strict_node_history, include_merged_revisions=include_merged_revisions,revprops=revprops)
+        fetcher = logfetcher(self, paths=newpaths, start=from_revnum, end=to_revnum, limit=limit, discover_changed_paths=discover_changed_paths, strict_node_history=strict_node_history, include_merged_revisions=include_merged_revisions, revprops=revprops)
         fetcher.start()
         return iter(fetcher.next, None)
 
@@ -458,7 +458,7 @@
 
     def get_locations(self, path, peg_revnum, revnums):
         conn = self.get_connection()
-        self.mutter('svn get_locations -r%d %s (%r)' % (peg_revnum,path,revnums))
+        self.mutter('svn get_locations -r%d %s (%r)' % (peg_revnum, path, revnums))
         try:
             return conn.get_locations(path, peg_revnum, revnums)
         finally:

=== modified file 'versionedfiles.py'
--- a/versionedfiles.py	2008-08-23 15:14:26 +0000
+++ b/versionedfiles.py	2008-08-23 17:55:26 +0000
@@ -44,7 +44,7 @@
             map = self.repository.get_fileid_map(revnum, branch, mapping)
             # Unfortunately, the map is the other way around
             lines = None
-            for k,(v,ck) in map.items():
+            for k, (v, ck) in map.items():
                 if v == fileid:
                     try:
                         stream = StringIO()
@@ -58,7 +58,7 @@
                     break
             if lines is None:
                 raise Exception("Inconsistent key specified: (%r,%r)" % (fileid, revid))
-            yield FulltextContentFactory((fileid,revid), None, 
+            yield FulltextContentFactory((fileid, revid), None, 
                         sha1=osutils.sha_strings(lines),
                         text=''.join(lines))
 




More information about the bazaar-commits mailing list