Merge lp:~jelmer/bzr-builddeb/git-fixes into lp:bzr-builddeb

[Jelmer Vernooij]

Some improvements for using bzr-builddeb on git branches.

- Don't consider .gitignore when looking for upstream sources
- Use Tree.iter_entries_by_dir() rather than Tree.inventory.iter_entries(); e.g. Git Tree implementations don't have inventories.

[John A Meinel (jameinel)]

review: approve

John
=:->
On Nov 7, 2012 6:10 AM, "Jelmer Vernooij" <email address hidden> wrote:

> Jelmer Vernooij has proposed merging lp:~jelmer/bzr-builddeb/git-fixes
> into lp:bzr-builddeb.
>
> Requested reviews:
> Bzr-builddeb-hackers (bzr-builddeb-hackers)
>
> For more details, see:
> https://code.launchpad.net/~jelmer/bzr-builddeb/git-fixes/+merge/133170
>
> Some improvements for using bzr-builddeb on git branches.
>
> - Don't consider .gitignore when looking for upstream sources
> - Use Tree.iter_entries_by_dir() rather than
> Tree.inventory.iter_entries(); e.g. Git Tree implementations don't have
> inventories.
> --
> https://code.launchpad.net/~jelmer/bzr-builddeb/git-fixes/+merge/133170
> You are subscribed to branch lp:bzr-builddeb.
>
> === modified file 'debian/changelog'
> --- debian/changelog 2012-09-06 23:25:29 +0000
> +++ debian/changelog 2012-11-07 02:09:18 +0000
> @@ -2,6 +2,7 @@
>
> * Cope with quilt output being empty in error message. LP: #1014543
> * Remove myself from uploaders.
> + * Don't consider .gitignore when looking for upstream sources.
>
> -- Jelmer Vernooij <email address hidden> Mon, 09 Jul 2012 12:04:50 +0200
>
>
> === modified file 'source_distiller.py'
> --- source_distiller.py 2012-01-02 22:02:47 +0000
> +++ source_distiller.py 2012-11-07 02:09:18 +0000
> @@ -83,7 +83,7 @@
> raise NotImplementedError(self._distill)
>
> def _prepare_working_tree(self):
> - for (dp, ie) in self.tree.inventory.iter_entries():
> + for (dp, ie) in self.tree.iter_entries_by_dir():
> ie._read_tree_state(dp, self.tree)
>
>
>
> === modified file 'util.py'
> --- util.py 2012-02-01 16:35:53 +0000
> +++ util.py 2012-11-07 02:09:18 +0000
> @@ -673,7 +673,8 @@
> if f[1] == 'V'])
> if len(present_files) == 0:
> return None
> - packaging_files = frozenset(["debian", ".bzr-builddeb", ".bzrignore"])
> + packaging_files = frozenset([
> + "debian", ".bzr-builddeb", ".bzrignore", ".gitignore"])
> return (len(present_files - packaging_files) > 0)
>
>
>
>
>

=== modified file 'debian/changelog'
--- debian/changelog	2012-09-06 23:25:29 +0000
+++ debian/changelog	2012-11-07 02:09:18 +0000
@@ -2,6 +2,7 @@
 
   * Cope with quilt output being empty in error message. LP: #1014543
   * Remove myself from uploaders.
+  * Don't consider .gitignore when looking for upstream sources.
 
  -- Jelmer Vernooij <[e-mail]>  Mon, 09 Jul 2012 12:04:50 +0200
 

=== modified file 'source_distiller.py'
--- source_distiller.py	2012-01-02 22:02:47 +0000
+++ source_distiller.py	2012-11-07 02:09:18 +0000
@@ -83,7 +83,7 @@
         raise NotImplementedError(self._distill)
 
     def _prepare_working_tree(self):
-        for (dp, ie) in self.tree.inventory.iter_entries():
+        for (dp, ie) in self.tree.iter_entries_by_dir():
             ie._read_tree_state(dp, self.tree)
 
 

=== modified file 'util.py'
--- util.py	2012-02-01 16:35:53 +0000
+++ util.py	2012-11-07 02:09:18 +0000
@@ -673,7 +673,8 @@
          if f[1] == 'V'])
     if len(present_files) == 0:
         return None
-    packaging_files = frozenset(["debian", ".bzr-builddeb", ".bzrignore"])
+    packaging_files = frozenset([
+        "debian", ".bzr-builddeb", ".bzrignore", ".gitignore"])
     return (len(present_files - packaging_files) > 0)