Rev 2123: Improve formatting. in http://people.samba.org/bzr/jelmer/bzr-svn/0.5

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 2123
revision-id: jelmer at samba.org-20081203191055-04ggnemgh2ue663x
parent: jelmer at samba.org-20081201065710-lesgesk1oiu54iu3
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.5
timestamp: Wed 2008-12-03 20:10:55 +0100
message:
  Improve formatting.
modified:
  commit.py                      commit.py-20060607190346-qvq128wgfubhhgm2-1
=== modified file 'commit.py'
--- a/commit.py	2008-12-01 01:25:56 +0000
+++ b/commit.py	2008-12-03 19:10:55 +0000
@@ -186,8 +186,7 @@
     # Loop over entries of file_id in old_inv
     # remove if they no longer exist with the same name
     # or parents
-    if (file_id in old_inv and 
-        old_inv[file_id].kind == 'directory'):
+    if file_id in old_inv and old_inv[file_id].kind == 'directory':
         for child_name in old_inv[file_id].children:
             child_ie = old_inv.get_child(file_id, child_name)
             # remove if...
@@ -224,8 +223,7 @@
             mutter('copy %s %r -> %r', child_ie.kind, 
                               old_inv.id2path(child_ie.file_id), 
                               new_child_path)
-            child_editor = dir_editor.add_file(
-                    full_new_child_path, 
+            child_editor = dir_editor.add_file(full_new_child_path, 
                 _url_escape_uri(urlutils.join(base_url, old_inv.id2path(child_ie.file_id))),
                 base_revnum)
 
@@ -253,17 +251,14 @@
                     value = properties.PROP_EXECUTABLE_VALUE
                 else:
                     value = None
-                child_editor.change_prop(
-                        properties.PROP_EXECUTABLE, value)
+                child_editor.change_prop(properties.PROP_EXECUTABLE, value)
 
             if old_special != (child_ie.kind == 'symlink'):
                 if child_ie.kind == 'symlink':
                     value = properties.PROP_SPECIAL_VALUE
                 else:
                     value = None
-
-                child_editor.change_prop(
-                        properties.PROP_SPECIAL, value)
+                child_editor.change_prop(properties.PROP_SPECIAL, value)
 
         # handle the file
         if child_ie.file_id in modified_files:
@@ -407,14 +402,18 @@
         self._svnprops = lazy_dict({}, lambda: dict(self._base_branch_props.iteritems()))
         self.base_mapping.export_revision(
             self.branch_path, timestamp, timezone, committer, revprops, 
-            revision_id, self.base_revno+1, parents, self._svn_revprops, self._svnprops)
+            revision_id, self.base_revno+1, parents, self._svn_revprops, 
+            self._svnprops)
 
         if len(merges) > 0:
-            new_svk_merges = update_svk_features(self._base_branch_props.get(SVN_PROP_SVK_MERGE, ""), merges)
+            old_svk_merges = self._base_branch_props.get(SVN_PROP_SVK_MERGE, "")
+            new_svk_merges = update_svk_features(old_svk_merges, merges)
             if new_svk_merges is not None:
                 self._svnprops[SVN_PROP_SVK_MERGE] = new_svk_merges
 
-            new_mergeinfo = update_mergeinfo(self.repository, graph, self._base_branch_props.get(properties.PROP_MERGEINFO, ""), self.base_revid, merges)
+            new_mergeinfo = update_mergeinfo(self.repository, graph,
+                self._base_branch_props.get(properties.PROP_MERGEINFO, ""), 
+                self.base_revid, merges)
             if new_mergeinfo is not None:
                 self._svnprops[properties.PROP_MERGEINFO] = new_mergeinfo