Merge lp:~jelmer/brz/reference-force into lp:brz

[Jelmer Vernooij]

Support forcing the setting of a reference.

Useful for testing.

[Martin Packman (gz)]

Change seems fine. The flag named --force is one to be careful with, tends to be easy to reach for but ambiguous. Fine here though? Not a commonly used command. Alternative would be `--unversioned` and fail in the inverse, or `--even-if-unversioned` or something else longish.

review: Approve

[Jelmer Vernooij (jelmer)]

How about --force-unversioned?

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/1/

=== modified file 'breezy/builtins.py'
--- breezy/builtins.py	2018-09-27 07:25:00 +0000
+++ breezy/builtins.py	2018-11-01 00:44:25 +0000
@@ -2972,7 +2972,8 @@
             Option('ignored', short_name='i',
                 help='Print ignored files.'),
             Option('kind', short_name='k',
-                   help='List entries of a particular kind: file, directory, symlink.',
+                   help=('List entries of a particular kind: file, '
+                         'directory, symlink, tree-reference.'),
                    type=text_type),
             'null',
             'show-ids',
@@ -6682,8 +6683,12 @@
     hidden = True
 
     takes_args = ['path?', 'location?']
+    takes_options = [
+        Option('force-unversioned',
+               help='Set reference even if path is not versioned.'),
+        ]
 
-    def run(self, path=None, location=None):
+    def run(self, path=None, location=None, force_unversioned=False):
         branchdir = '.'
         if path is not None:
             branchdir = path
@@ -6697,7 +6702,7 @@
             info = viewitems(branch._get_all_reference_info())
             self._display_reference_info(tree, branch, info)
         else:
-            if not tree.is_versioned(path):
+            if not tree.is_versioned(path) and not force_unversioned:
                 raise errors.NotVersionedError(path)
             if location is None:
                 info = [(path, branch.get_reference_info(path))]

=== modified file 'breezy/tests/blackbox/test_reference.py'
--- breezy/tests/blackbox/test_reference.py	2018-07-07 15:06:42 +0000
+++ breezy/tests/blackbox/test_reference.py	2018-11-01 00:44:25 +0000
@@ -87,3 +87,13 @@
         out, err = self.run_bzr('reference file http://example.org',
                                 working_dir='tree', retcode=3)
         self.assertEqual('brz: ERROR: file is not versioned.\n', err)
+
+    def test_missing_file_forced(self):
+        tree = self.make_branch_and_tree('tree')
+        out, err = self.run_bzr(
+                'reference --force-unversioned file http://example.org',
+                working_dir='tree')
+        location, file_id = tree.branch.get_reference_info('file')
+        self.assertEqual('http://example.org', location)
+        self.assertEqual('', out)
+        self.assertEqual('', err)