Rev 1820: Simplify code in commit. in file:///data/jelmer/bzr-svn/trunk/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/trunk/

------------------------------------------------------------
revno: 1820
revision-id: jelmer at samba.org-20080905230153-ef7cjzqvrra0b1dd
parent: jelmer at samba.org-20080905224129-a2s8ogrg0u8pnw61
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Sat 2008-09-06 01:01:53 +0200
message:
  Simplify code in commit.
modified:
  commit.py                      commit.py-20060607190346-qvq128wgfubhhgm2-1
=== modified file 'commit.py'
--- a/commit.py	2008-09-05 22:41:29 +0000
+++ b/commit.py	2008-09-05 23:01:53 +0000
@@ -164,12 +164,16 @@
             graph = self.repository.get_graph()
         self.base_revno = graph.find_distance_to_null(self.base_revid, [])
         if self.base_revid == NULL_REVISION:
+            self._base_revmeta = None
+            self._base_branch_props = {}
             self.base_revnum = -1
             self.base_path = None
             self.base_mapping = repository.get_mapping()
         else:
             (self.base_path, self.base_revnum, self.base_mapping) = \
                 repository.lookup_revision_id(self.base_revid)
+            self._base_revmeta = self.repository._revmeta_provider.get_revision(self.base_path, self.base_revnum)
+            self._base_branch_props = self._base_revmeta.get_fileprops()
 
         if old_inv is None:
             if self.base_revid == NULL_REVISION:
@@ -187,12 +191,6 @@
 
         self.visit_dirs = set()
         self.modified_files = {}
-        if self.base_revid == NULL_REVISION:
-            self._base_revmeta = None
-            self._base_branch_props = {}
-        else:
-            self._base_revmeta = self.repository._revmeta_provider.get_revision(self.base_path, self.base_revnum)
-            self._base_branch_props = self._base_revmeta.get_fileprops()
         self.supports_custom_revprops = self.repository.transport.has_capability("commit-revprops")
         if (self.supports_custom_revprops is None and 
             self.base_mapping.can_use_revprops and