Merge lp:~jelmer/brz-git/dir-change-content into lp:brz-git

[Jelmer Vernooij]

Directories don't change when their contents do.

Directories don't change when their contents do.

[Jelmer Vernooij (jelmer)]

Rubberstamp! Proposer approves of own proposal.

review: Approve

=== modified file 'filegraph.py'
--- filegraph.py	2018-02-17 03:33:59 +0000
+++ filegraph.py	2018-03-08 11:53:46 +0000
@@ -18,6 +18,8 @@
 
 from __future__ import absolute_import
 
+import stat
+
 from dulwich.errors import (
     NotTreeError,
     )
@@ -40,6 +42,9 @@
         commit = self.store[commit_id]
         target_mode, target_sha = tree_lookup_path(self.store.__getitem__,
             commit.tree, path)
+        if path == '':
+            target_mode = stat.S_IFDIR | 0644
+        assert target_mode is not None, "sha %r for %r in %r" % (target_sha, path, commit_id)
         while True:
             parent_commits = []
             for parent_commit in [self.store[c] for c in commit.parents]:
@@ -50,8 +55,13 @@
                     continue
                 else:
                     parent_commits.append(parent_commit)
-                if mode != target_mode or sha != target_sha:
-                    return (path, commit.id)
+                if path == '':
+                    mode = stat.S_IFDIR | 0644
+                # Candidate found iff, mode or text changed,
+                # or is a directory that didn't previously exist.
+                if mode != target_mode or (
+                    not stat.S_ISDIR(target_mode) and sha != target_sha):
+                        return (path, commit.id)
             if parent_commits == []:
                 break
             commit = parent_commits[0]