Rev 3893: Cleanup. in file:///net/bigmamac/Volumes/home/vila/src/bzr/cases/3232-spurious-conflict/

[Vincent Ladeuil]

At file:///net/bigmamac/Volumes/home/vila/src/bzr/cases/3232-spurious-conflict/

------------------------------------------------------------
revno: 3893
revision-id: v.ladeuil+lp at free.fr-20081215154346-5r5yc09f9ig904w7
parent: v.ladeuil+lp at free.fr-20081215143819-pocdcxw3so8ppjyk
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: log-deep
timestamp: Mon 2008-12-15 16:43:46 +0100
message:
  Cleanup.
-------------- next part --------------
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2008-12-12 13:03:09 +0000
+++ b/bzrlib/builtins.py	2008-12-15 15:43:46 +0000
@@ -1894,7 +1894,6 @@
             else:
                 delta_filter = None
                 if deep:
-                    # FIXME: missing test
                     warning('No file specified, --deep ignored')
 
             lf = log_format(show_ids=show_ids, to_file=self.outf,

=== modified file 'bzrlib/log.py'
--- a/bzrlib/log.py	2008-12-15 14:38:19 +0000
+++ b/bzrlib/log.py	2008-12-15 15:43:46 +0000
@@ -290,11 +290,6 @@
         view_revisions = _filter_revisions_touching_file_id(branch,
                                                             specific_fileid,
                                                             view_revisions)
-#    if _path_filter:
-#        view_revisions = _filter_revisions_touching_path(branch,
-#                                                         view_revisions,
-#                                                         _path_filter)
-
     # rebase merge_depth - unless there are no revisions or 
     # either the first or last revision have merge_depth = 0.
     if view_revisions and view_revisions[0][2] and view_revisions[-1][2]:
@@ -649,28 +644,6 @@
     return result
 
 
-#def _filter_revisions_touching_path(branch,view_revisions, filter):
-#   """Return the list of revision ids which touch paths matching filter.
-#
-#   :param branch: The branch where we can get text revision information.
-#
-#   :param view_revisions: A list of (revision_id, dotted_revno, merge_depth)
-#       tuples. This is the list of revisions which will be filtered. It is
-#       assumed that view_revisions is in merge_sort order (i.e. newest
-#       revision first ).
-#
-#   :return: A list of (revision_id, dotted_revno, merge_depth) tuples.
-#   """
-#    
-#    kept = []
-#    first = view_revisions[0]
-#    
-#    for revid, revno, depth in view_revisions[1:]:
-
-#       use iter_changes from previous revision to current and filter from a
-#       path list.
-#    return view_revisions
-
 def get_view_revisions(mainline_revs, rev_nos, branch, direction,
                        include_merges=True):
     """Produce an iterator of revisions to show