Rev 2: Fix up the various things that weren't being imported as a plugin in http://bzr.arbash-meinel.com/plugins/file_log

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/plugins/file_log

------------------------------------------------------------
revno: 2
revision-id: john at arbash-meinel.com-20080918152416-eot2zpfkigfzwtqx
parent: john at arbash-meinel.com-20080918151504-959o091bpv2kxfgn
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: file_log
timestamp: Thu 2008-09-18 10:24:16 -0500
message:
  Fix up the various things that weren't being imported as a plugin
-------------- next part --------------
=== modified file '__init__.py'
--- a/__init__.py	2008-09-18 15:15:04 +0000
+++ b/__init__.py	2008-09-18 15:24:16 +0000
@@ -33,8 +33,12 @@
     takes_options = ['log-format']
 
     def run(self, filename, log_format=None):
+        from bzrlib import (
+            log,
+            workingtree,
+            )
         import file_log
-        tree, relpath = WorkingTree.open_containing(filename)
+        tree, relpath = workingtree.WorkingTree.open_containing(filename)
         tree.lock_read()
         try:
             file_id = tree.path2id(relpath)
@@ -56,7 +60,7 @@
 
             if log_format is None:
                 log_format = log.log_formatter_registry.get_default(tree.branch)
-            lf = log_format(show_ids=False, to_file=self.outf,
+            lf = log_format(show_ids=True, to_file=self.outf,
                             show_timezone='original')
             file_log.log_one_file(tree, file_id, revision_id, lf)
         finally:

=== modified file 'file_log.py'
--- a/file_log.py	2008-09-18 15:15:04 +0000
+++ b/file_log.py	2008-09-18 15:24:16 +0000
@@ -57,6 +57,6 @@
     rev_tag_dict = {}
     for revs in revision_iterator:
         for (rev_id, revno, merge_depth), rev, delta in revs:
-            lr = LogRevision(rev, revno, merge_depth, delta,
-                             rev_tag_dict.get(rev_id))
+            lr = log.LogRevision(rev, revno, merge_depth, delta,
+                                 rev_tag_dict.get(rev_id))
             log_formatter.log_revision(lr)