diff options
author | Basil Gello <vasek.gello@gmail.com> | 2018-05-25 20:23:52 +0300 |
---|---|---|
committer | Basil Gello <vasek.gello@gmail.com> | 2019-06-06 07:36:10 +0000 |
commit | c745350ab93e9f0417b312d5509d16a7004485f4 (patch) | |
tree | a1f17d08bb991bb38aabe82c8cec8d5c4f0cf6b8 /subcmds/diffmanifests.py | |
parent | 025704e946562cec18b587a2a54dbe30e20cfb44 (diff) | |
download | git-repo-c745350ab93e9f0417b312d5509d16a7004485f4.tar.gz |
diffmanifests: honor user-supplied manifest paths
The current implementation ignores the user-specified paths to
manifests. if the "repo diffmanifests" is invoked with absolute
file paths for one or both manifests, the command fails with message:
fatal: duplicate path ... in /tmp/manifest-old.xml
Also the current implementation fails to expand the absolute path to
manifest files if "repo diffmanifests" is invoked with relative
paths, i.e "repo diffmanifests manifest-old.xml manifest-new.xml".
fatal: manifest manifest-old.xml not found
This commit fixes the first issue by disabling the local manifest
discovery for diffmanifests command, and the second issue by
expanding paths to manifests within "diffmanifests" sub-command.
Test: repo manifest --revision-as-HEAD -o /tmp/manifest-old.xml
repo sync
repo manifest --revision-as-HEAD -o /tmp/manifest-new.xml
repo diffmanifests /tmp/manifest-old.xml /tmp/manifest-new.xml
Change-Id: Ia125d769bfbea75adb9aba81abbd8c636f2168d4
Signed-off-by: Vasyl Gello <vasek.gello@gmail.com>
Diffstat (limited to 'subcmds/diffmanifests.py')
-rw-r--r-- | subcmds/diffmanifests.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/subcmds/diffmanifests.py b/subcmds/diffmanifests.py index 751a2026..a1e823cd 100644 --- a/subcmds/diffmanifests.py +++ b/subcmds/diffmanifests.py | |||
@@ -190,12 +190,12 @@ synced and their revisions won't be found. | |||
190 | self.printProject = self.printAdded = self.printRemoved = self.printRevision = self.printText | 190 | self.printProject = self.printAdded = self.printRemoved = self.printRevision = self.printText |
191 | 191 | ||
192 | manifest1 = XmlManifest(self.manifest.repodir) | 192 | manifest1 = XmlManifest(self.manifest.repodir) |
193 | manifest1.Override(args[0]) | 193 | manifest1.Override(args[0], load_local_manifests=False) |
194 | if len(args) == 1: | 194 | if len(args) == 1: |
195 | manifest2 = self.manifest | 195 | manifest2 = self.manifest |
196 | else: | 196 | else: |
197 | manifest2 = XmlManifest(self.manifest.repodir) | 197 | manifest2 = XmlManifest(self.manifest.repodir) |
198 | manifest2.Override(args[1]) | 198 | manifest2.Override(args[1], load_local_manifests=False) |
199 | 199 | ||
200 | diff = manifest1.projectsDiff(manifest2) | 200 | diff = manifest1.projectsDiff(manifest2) |
201 | if opt.raw: | 201 | if opt.raw: |