Merge ~nacc/git-ubuntu:repo_builder-patches-applied into git-ubuntu:master

[Nish Aravamudan]

make jenkins happy

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:b5756225b70116c571dd3d710427a6874e0b9211
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/379/
Executed test runs:
    SUCCESS: VM Setup
    SUCCESS: Build
    SUCCESS: Unit Tests
    SUCCESS: Integration Tests
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/379/rebuild

review: Approve (continuous-integration)

[Andreas Hasenack (ahasenack)]

Looks good.

Could you please also update the test_source_quilt_with_patches() test to check that the patches were *not* applied? i.e., that we do not have the "a" and "b" files.

review: Approve

[Andreas Hasenack (ahasenack)]

Thanks, +1

review: Approve

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:dc2ec6686cc257f4eff1b56b0ee699340de3c725
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/380/
Executed test runs:
    SUCCESS: VM Setup
    SUCCESS: Build
    SUCCESS: Unit Tests
    SUCCESS: Integration Tests
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/380/rebuild

review: Approve (continuous-integration)

diff --git a/gitubuntu/importer.py b/gitubuntu/importer.py
index c3e2800..478ffa4 100644
--- a/gitubuntu/importer.py
+++ b/gitubuntu/importer.py
@@ -90,11 +90,13 @@ class ParentOverrideError(GitUbuntuImportError):
     pass
 
 
-def dsc_to_tree_hash(pygit2_repo, dsc_path):
+def dsc_to_tree_hash(pygit2_repo, dsc_path, patches_applied=False):
     '''Convert a dsc file into a git tree in the given repo
 
     pygit2_repo: pygit2.Repository object
     dsc_path: string path to dsc file
+    patches_applied: bool whether patches should be applied on
+        extraction
 
     Returns: tree hash as a hex string
     '''
@@ -105,15 +107,12 @@ def dsc_to_tree_hash(pygit2_repo, dsc_path):
         # extracted_dir.
 
         extracted_dir = os.path.join(temp_dir, 'x')
-        run(
-            [
-                'dpkg-source',
-                '-x',
-                '--skip-patches',
-                dsc_path,
-                extracted_dir,  # this is <temp_dir>/x
-            ]
-        )
+        cmd = ['dpkg-source', '-x']
+        if not patches_applied:
+            cmd.append('--skip-patches')
+        # extracted_dir is <temp_dir>/x
+        cmd.extend([dsc_path, extracted_dir])
+        run(cmd)
 
         if not os.path.exists(extracted_dir):
             logging.error("No source extracted?")
diff --git a/gitubuntu/repo_builder.py b/gitubuntu/repo_builder.py
index e46650c..94bc62a 100644
--- a/gitubuntu/repo_builder.py
+++ b/gitubuntu/repo_builder.py
@@ -180,21 +180,28 @@ class Tree(NamedMixin, WriteMixin):
 
 
 class SourceTree(NamedMixin, WriteMixin):
-    def __init__(self, source, **kwargs):
+    def __init__(self, source, patches_applied=False, **kwargs):
         """Construct a git tree representation of a source_builder.Source
 
         :param source_tree.SourceBuilder source: the source whose git tree this
             object will represent
+        :param patches_applied bool: whether patches should be applied
+            in this source tree
         """
         super().__init__(**kwargs)
         self.source = source
+        self.patches_applied = patches_applied
 
     def walk(self, parent=None):
         yield parent, self
 
     def _obj_to_oid(self, repo, record):
         with self.source as dsc_path:
-            oid_str = gitubuntu.importer.dsc_to_tree_hash(repo, dsc_path)
+            oid_str = gitubuntu.importer.dsc_to_tree_hash(
+                repo,
+                dsc_path,
+                self.patches_applied,
+            )
         return pygit2.Oid(binascii.unhexlify(oid_str))
 
 
diff --git a/gitubuntu/source_builder_test.py b/gitubuntu/source_builder_test.py
index 4b7981a..41a95de 100644
--- a/gitubuntu/source_builder_test.py
+++ b/gitubuntu/source_builder_test.py
@@ -9,14 +9,20 @@ import gitubuntu.git_repository as git_repository
 from gitubuntu.test_fixtures import repo
 
 
-def dsc_path_to_tree(repo, dsc_path):
+def dsc_path_to_tree(repo, dsc_path, patches_applied=False):
     """Convert a dsc filesystem path to a pygit2.Tree object.
 
     :param GitUbuntuRepository repo: repository wrapper object
     :param str dsc_path: path to dsc file
+    :param bool patches_applied: whether all quilt patches should be
+        applied during extraction
     :rtype: pygit2.Tree
     """
-    tree_hash = importer.dsc_to_tree_hash(repo.raw_repo, dsc_path)
+    tree_hash = importer.dsc_to_tree_hash(
+        repo.raw_repo,
+        dsc_path,
+        patches_applied,
+    )
     return repo.raw_repo.get(tree_hash)
 
 
@@ -90,6 +96,33 @@ def test_source_quilt_with_patches(repo):
                 top,
                 'debian/patches/%s' % basename,
             )
+        unexpected_files = ['a', 'b']
+        for filename in unexpected_files:
+            with pytest.raises(KeyError):
+                git_repository.follow_symlinks_to_blob(
+                    repo.raw_repo,
+                    top,
+                    filename,
+                )
+
+
+def test_source_quilt_with_patches_applied(repo):
+    spec = target.SourceSpec(native=False, has_patches=True)
+    with target.Source(spec) as dsc_path:
+        top = dsc_path_to_tree(repo, dsc_path, patches_applied=True)
+        expected_files = [
+            'debian/patches/series',
+            'debian/patches/a',
+            'debian/patches/b',
+            'a',
+            'b',
+        ]
+        for filename in expected_files:
+            assert git_repository.follow_symlinks_to_blob(
+                repo.raw_repo,
+                top,
+                filename,
+            )
 
 
 def test_source_version_native_default(repo):