diff options
| author | David Pursehouse <david.pursehouse@sonymobile.com> | 2013-03-08 01:12:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-03-08 01:12:56 +0000 |
| commit | a27852d0e707046558dfef9145f56b64b1331c7a (patch) | |
| tree | f8ba2ff81c074beff302db0911cf2e896c8df561 | |
| parent | 3ee6ffd07852c184feef5afd695d80a3f9a0db79 (diff) | |
| parent | 61ac9ae090d81bfd086ed8b3ca961de1cc77e3cc (diff) | |
| download | git-repo-a27852d0e707046558dfef9145f56b64b1331c7a.tar.gz | |
Merge "Add manifest groups to the output of `info`"
| -rw-r--r-- | subcmds/info.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/subcmds/info.py b/subcmds/info.py index 8fb363f3..325874b5 100644 --- a/subcmds/info.py +++ b/subcmds/info.py | |||
| @@ -53,7 +53,10 @@ class Info(PagedCommand): | |||
| 53 | 53 | ||
| 54 | self.opt = opt | 54 | self.opt = opt |
| 55 | 55 | ||
| 56 | mergeBranch = self.manifest.manifestProject.config.GetBranch("default").merge | 56 | manifestConfig = self.manifest.manifestProject.config |
| 57 | mergeBranch = manifestConfig.GetBranch("default").merge | ||
| 58 | manifestGroups = (manifestConfig.GetString('manifest.groups') | ||
| 59 | or 'all,-notdefault') | ||
| 57 | 60 | ||
| 58 | self.heading("Manifest branch: ") | 61 | self.heading("Manifest branch: ") |
| 59 | self.headtext(self.manifest.default.revisionExpr) | 62 | self.headtext(self.manifest.default.revisionExpr) |
| @@ -61,6 +64,9 @@ class Info(PagedCommand): | |||
| 61 | self.heading("Manifest merge branch: ") | 64 | self.heading("Manifest merge branch: ") |
| 62 | self.headtext(mergeBranch) | 65 | self.headtext(mergeBranch) |
| 63 | self.out.nl() | 66 | self.out.nl() |
| 67 | self.heading("Manifest groups: ") | ||
| 68 | self.headtext(manifestGroups) | ||
| 69 | self.out.nl() | ||
| 64 | 70 | ||
| 65 | self.printSeparator() | 71 | self.printSeparator() |
| 66 | 72 | ||