Rev 3898: Rename --deep into --old since there is agreement on that. 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: 3898
revision-id: v.ladeuil+lp at free.fr-20090107180831-vdk4fnesucgmvowx
parent: v.ladeuil+lp at free.fr-20090107153920-1wj976bx3rxsdrcv
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: log-deep
timestamp: Wed 2009-01-07 19:08:31 +0100
message:
  Rename --deep into --old since there is agreement on that.
  
  * bzrlib/tests/blackbox/test_log.py:
  (TestLogFileOld): Renamed from TestLogFileDeep. s/deep/old/g too.
  
  * bzrlib/builtins.py:
  (cmd_log): Rename --deep into --old.
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2009-01-07 15:39:20 +0000
+++ b/NEWS	2009-01-07 18:08:31 +0000
@@ -20,7 +20,7 @@
 
   NEW FEATURES:
 
-    * ``bzr log`` now accepts a --deep option to look at files not present any
+    * ``bzr log`` now accepts a --old option to look at files not present any
       more in the working tree. Be aware that the actual implementation is
       slow as it needs to search all revisions, so restricting the required
       revisions (as in providing ``-r-25..`` may help).

=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2008-12-17 16:24:51 +0000
+++ b/bzrlib/builtins.py	2009-01-07 18:08:31 +0000
@@ -1777,8 +1777,8 @@
             'timezone',
             custom_help('verbose',
                    help='Show files changed in each revision.'),
-            Option('deep',
-                   help='Search for file in all revisions (slower).'),
+            Option('old',
+                   help='Search for file by path in all revisions (slower).'),
             'show-ids',
             'revision',
             Option('change',
@@ -1803,7 +1803,7 @@
     @display_command
     def run(self, location=None, timezone='original',
             verbose=False,
-            deep=False,
+            old=False,
             show_ids=False,
             forward=False,
             revision=None,
@@ -1838,7 +1838,7 @@
             if fp != '':
                 if tree is None:
                     tree = b.basis_tree()
-                if not deep:
+                if not old:
                     specific_file_id = tree.path2id(fp)
                     if specific_file_id is None:
                         raise errors.BzrCommandError(
@@ -1882,7 +1882,7 @@
 
             _path_filter = None
             if specific_file_id or specific_file_path:
-                if deep:
+                if old:
                     def only_that_file(path, file_id):
                         return path == specific_file_path
                     # the specific file id doesn't apply anymore
@@ -1894,8 +1894,8 @@
                 delta_filter = only_that_file
             else:
                 delta_filter = None
-                if deep:
-                    warning('No file specified, --deep ignored')
+                if old:
+                    warning('No file specified, --old ignored')
 
             lf = log_format(show_ids=show_ids, to_file=self.outf,
                             show_timezone=timezone,

=== modified file 'bzrlib/tests/blackbox/test_log.py'
--- a/bzrlib/tests/blackbox/test_log.py	2009-01-07 15:39:20 +0000
+++ b/bzrlib/tests/blackbox/test_log.py	2009-01-07 18:08:31 +0000
@@ -575,10 +575,10 @@
         self.assertNotContainsRe(log, 'revno: 4\n')
 
 
-class TestLogFileDeep(TestCaseWithTransport):
+class TestLogFileOld(TestCaseWithTransport):
 
     def setUp(self):
-        super(TestLogFileDeep, self).setUp()
+        super(TestLogFileOld, self).setUp()
         wt = self.make_branch_and_tree('branch')
         self.build_tree_contents([('branch/f1', '1\n'),
                                   ('branch/f2', '2\n'),
@@ -597,32 +597,32 @@
         self.addCleanup(os.chdir, '..')
         self.tree = wt
 
-    def test_log_file_not_deep_short(self):
+    def test_log_file_not_old_short(self):
         log = self.run_bzr(['log', '-v', '--short',  'f2'])[0]
         self.assertNotContainsRe(log, 'A  f1\n')
         self.assertNotContainsRe(log, '  f1\n')
         self.assertContainsRe(log,  '  f2\n')
 
-    def test_log_old_file_deep(self):
-        log = self.run_bzr(['log', '-v', '--short', '--deep', 'f1'])[0]
+    def test_log_old_file_old(self):
+        log = self.run_bzr(['log', '-v', '--short', '--old', 'f1'])[0]
         # revnos 1 and 2 appear and mention adding and deleting f1
         self.assertContainsRe(log, '(?sm)^ +2 joe.*D  f1\n.*^ +1 joe.*A  f1\n')
         self.assertNotContainsRe(log, '(?sm)^ +3 joe')
 
-    def test_log_file_deep_short(self):
-        log = self.run_bzr(['log', '-v', '--deep', '--short',  'f2'])[0]
+    def test_log_file_old_short(self):
+        log = self.run_bzr(['log', '-v', '--old', '--short',  'f2'])[0]
         # revnos 1 and 3 appear and mention adding f2
         self.assertContainsRe(log, '(?sm)^ +3 joe.*A  f2\n.*^ +1 joe.*A  f2\n')
         # revno 2 appears and mentions deleting f2
         self.assertContainsRe(log, '(?sm)^ +2 joe.*D  f2\n')
 
-    def test_log_old_file_not_deep(self):
-        # Without deep, we can't query an old file
+    def test_log_old_file_not_old(self):
+        # Without old, we can't query an old file
         log = self.run_bzr(['log', '-v', 'f1'], retcode=3)[0]
 
-    def test_log_deep_without_file_warns(self):
-        log, err = self.run_bzr(['log', '--deep'])
-        self.assertEquals('No file specified, --deep ignored\n', err)
+    def test_log_old_without_file_warns(self):
+        log, err = self.run_bzr(['log', '--old'])
+        self.assertEquals('No file specified, --old ignored\n', err)
 
 # tests for:
 # -- filter out already merged revisions a la _filter_revisions_touching_file_id