Merge lp:~a-s-usov/bzr-fastimport/fast-import-filter-fixes into lp:bzr-fastimport

[Alex Usov]

Flag renamed

[Jelmer Vernooij (jelmer)]

As in the python-fastimport merge proposal, I think saying that the option "preserves all history" is misleading. History is still changed, just not as aggressively as it is without the option.

Perhaps --dont-squash-empty-commits would be a better name.

> + help="Preserve all commits and links between them"
This lacks a dot at the end of the line.

[Jelmer Vernooij (jelmer)]

review: Needs Fixing

[Jelmer Vernooij (jelmer)]

Thanks, this looks good now. I'll merge with a few tweaks to the description.

review: Approve

=== modified file 'cmds.py'
--- cmds.py	2011-10-17 15:41:16 +0000
+++ cmds.py	2011-10-21 09:41:26 +0000
@@ -387,6 +387,15 @@
         User mapping is supported by both the fast-import and
         fast-import-filter commands.
 
+    :History rewriting:
+
+     By default fast-import-filter does quite aggressive history rewriting.
+     Empty commits (or commits which had all their content filtered out) will
+     be removed, and so are the references to commits not included in the stream.
+
+     Flag --dont-squash-empty-commits reverses this behavior and makes it possible to
+     use fast-import-filter on incremental streams.
+
     :Examples:
 
      Create a new project from a library (note the trailing / on the
@@ -415,15 +424,19 @@
                     Option('user-map', type=str,
                         help="Path to file containing a map of user-ids.",
                         ),
+                    Option('dont-squash-empty-commits',
+                        help="Preserve all commits and links between them"
+                        ),
                      ]
     encoding_type = 'exact'
     def run(self, source=None, verbose=False, include_paths=None,
-        exclude_paths=None, user_map=None):
+        exclude_paths=None, user_map=None, dont_squash_empty_commits=False):
         load_fastimport()
         from fastimport.processors import filter_processor
         params = {
             'include_paths': include_paths,
             'exclude_paths': exclude_paths,
+            'squash_empty_commits': not dont_squash_empty_commits,
             }
         from fastimport import parser
         stream = _get_source_stream(source)