Merge lp:~al-maisan/bzr-builddeb/refuse-building-trees-with-conflicts into lp:~bzr-builddeb-hackers/bzr-builddeb/trunk-old

[Muharem Hrnjadovic]

[Muharem Hrnjadovic (al-maisan)]

Hello there!

This branch adds a "refuse to build in a tree with conflicts" check. Please have a look and let me know what you think.

Thanks!

[lp:~al-maisan/bzr-builddeb/refuse-building-trees-with-conflicts]

372. By Muharem Hrnjadovic on 2009-09-11

Cosmetic fix.

[James Westby (james-w)]

Looks good, thanks.

James

review: Approve

=== modified file 'cmds.py'
--- cmds.py	2009-08-24 17:33:44 +0000
+++ cmds.py	2009-09-11 12:14:13 +0000
@@ -356,6 +356,12 @@
                 branch_or_build_options_list, source)
         tree, branch, is_local = self._get_tree_and_branch(branch)
         tree, working_tree = self._get_build_tree(revision, tree, branch)
+
+        if len(tree.conflicts()) > 0:
+            raise BzrCommandError(
+                "There are conflicts in the working tree. "
+                "You must resolve these before building.")
+
         tree.lock_read()
         try:
             config = debuild_config(tree, working_tree, no_user_config)

=== modified file 'tests/blackbox/test_builddeb.py'
--- tests/blackbox/test_builddeb.py	2009-02-19 11:13:09 +0000
+++ tests/blackbox/test_builddeb.py	2009-09-11 12:14:13 +0000
@@ -78,6 +78,26 @@
     tree.add([self.uncommited_file])
     return tree
 
+  def build_tree_with_conflict(self):
+    tree = self.make_unpacked_source()
+    self.build_tree([self.commited_file, self.uncommited_file,
+                     self.unadded_file])
+    tree.add([self.commited_file])
+    tree.commit("one", rev_id='revid1')
+    newtree = tree.bzrdir.sprout('newtree').open_workingtree()
+    tree.add([self.uncommited_file])
+    tree.commit("two", rev_id='revid2')
+
+    p = '%s/work/newtree/%s' % (self.test_base_dir, self.uncommited_file)
+    fh = open(p, 'w')
+    fh.write('** This is the conflicting line.')
+    fh.close()
+    newtree.add([self.uncommited_file])
+    newtree.commit("new-two", rev_id='revidn2')
+    conflicts = tree.merge_from_branch(newtree.branch) 
+
+    return (conflicts, tree)
+
   def test_builddeb_uses_working_tree(self):
     self.build_really_simple_tree()
     self.run_bzr("builddeb --no-user-conf --native --builder true "
@@ -85,6 +105,13 @@
     self.assertInBuildDir([self.commited_file, self.uncommited_file])
     self.assertNotInBuildDir([self.unadded_file])
 
+  def test_builddeb_refuses_tree_with_conflicts(self):
+    (conflicts, tree) = self.build_tree_with_conflict()
+    self.assertTrue(conflicts > 0)
+    self.run_bzr_error(
+      ['There are conflicts in the working tree. You must resolve these before building.'],
+      "builddeb --no-user-conf --native --builder true --dont-purge")
+
   def test_builddeb_uses_revision_when_told(self):
     self.build_really_simple_tree()
     self.run_bzr("builddeb --no-user-conf "