diff options
-rw-r--r-- | manifest_xml.py | 5 | ||||
-rw-r--r-- | subcmds/diffmanifests.py | 10 |
2 files changed, 14 insertions, 1 deletions
diff --git a/manifest_xml.py b/manifest_xml.py index ea274c76..b7579d5d 100644 --- a/manifest_xml.py +++ b/manifest_xml.py | |||
@@ -1940,11 +1940,14 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md | |||
1940 | fromKeys = sorted(fromProjects.keys()) | 1940 | fromKeys = sorted(fromProjects.keys()) |
1941 | toKeys = sorted(toProjects.keys()) | 1941 | toKeys = sorted(toProjects.keys()) |
1942 | 1942 | ||
1943 | diff = {'added': [], 'removed': [], 'changed': [], 'unreachable': []} | 1943 | diff = {'added': [], 'removed': [], 'missing': [], 'changed': [], 'unreachable': []} |
1944 | 1944 | ||
1945 | for proj in fromKeys: | 1945 | for proj in fromKeys: |
1946 | if proj not in toKeys: | 1946 | if proj not in toKeys: |
1947 | diff['removed'].append(fromProjects[proj]) | 1947 | diff['removed'].append(fromProjects[proj]) |
1948 | elif not fromProjects[proj].Exists: | ||
1949 | diff['missing'].append(toProjects[proj]) | ||
1950 | toKeys.remove(proj) | ||
1948 | else: | 1951 | else: |
1949 | fromProj = fromProjects[proj] | 1952 | fromProj = fromProjects[proj] |
1950 | toProj = toProjects[proj] | 1953 | toProj = toProjects[proj] |
diff --git a/subcmds/diffmanifests.py b/subcmds/diffmanifests.py index 0e5f4108..08196ef9 100644 --- a/subcmds/diffmanifests.py +++ b/subcmds/diffmanifests.py | |||
@@ -118,6 +118,16 @@ synced and their revisions won't be found. | |||
118 | self.printRevision(project.revisionExpr) | 118 | self.printRevision(project.revisionExpr) |
119 | self.out.nl() | 119 | self.out.nl() |
120 | 120 | ||
121 | if diff['missing']: | ||
122 | self.out.nl() | ||
123 | self.printText('missing projects : \n') | ||
124 | self.out.nl() | ||
125 | for project in diff['missing']: | ||
126 | self.printProject('\t%s' % (project.relpath)) | ||
127 | self.printText(' at revision ') | ||
128 | self.printRevision(project.revisionExpr) | ||
129 | self.out.nl() | ||
130 | |||
121 | if diff['changed']: | 131 | if diff['changed']: |
122 | self.out.nl() | 132 | self.out.nl() |
123 | self.printText('changed projects : \n') | 133 | self.printText('changed projects : \n') |