diff options
Diffstat (limited to 'subcmds')
-rw-r--r-- | subcmds/info.py | 2 | ||||
-rw-r--r-- | subcmds/init.py | 4 | ||||
-rw-r--r-- | subcmds/sync.py | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/subcmds/info.py b/subcmds/info.py index ed196e90..f2827b34 100644 --- a/subcmds/info.py +++ b/subcmds/info.py | |||
@@ -45,7 +45,7 @@ class Info(PagedCommand): | |||
45 | def Execute(self, opt, args): | 45 | def Execute(self, opt, args): |
46 | self.out = _Coloring(self.manifest.globalConfig) | 46 | self.out = _Coloring(self.manifest.globalConfig) |
47 | self.heading = self.out.printer('heading', attr = 'bold') | 47 | self.heading = self.out.printer('heading', attr = 'bold') |
48 | self.headtext = self.out.printer('headtext', fg = 'yellow') | 48 | self.headtext = self.out.nofmt_printer('headtext', fg = 'yellow') |
49 | self.redtext = self.out.printer('redtext', fg = 'red') | 49 | self.redtext = self.out.printer('redtext', fg = 'red') |
50 | self.sha = self.out.printer("sha", fg = 'yellow') | 50 | self.sha = self.out.printer("sha", fg = 'yellow') |
51 | self.text = self.out.nofmt_printer('text') | 51 | self.text = self.out.nofmt_printer('text') |
diff --git a/subcmds/init.py b/subcmds/init.py index 9a9e8499..632d1a33 100644 --- a/subcmds/init.py +++ b/subcmds/init.py | |||
@@ -197,6 +197,8 @@ to update the working directory files. | |||
197 | else: | 197 | else: |
198 | m.PreSync() | 198 | m.PreSync() |
199 | 199 | ||
200 | self._ConfigureDepth(opt) | ||
201 | |||
200 | if opt.manifest_url: | 202 | if opt.manifest_url: |
201 | r = m.GetRemote(m.remote.name) | 203 | r = m.GetRemote(m.remote.name) |
202 | r.url = opt.manifest_url | 204 | r.url = opt.manifest_url |
@@ -429,6 +431,4 @@ to update the working directory files. | |||
429 | self._ConfigureUser() | 431 | self._ConfigureUser() |
430 | self._ConfigureColor() | 432 | self._ConfigureColor() |
431 | 433 | ||
432 | self._ConfigureDepth(opt) | ||
433 | |||
434 | self._DisplayResult() | 434 | self._DisplayResult() |
diff --git a/subcmds/sync.py b/subcmds/sync.py index fafc1e5c..ec7337aa 100644 --- a/subcmds/sync.py +++ b/subcmds/sync.py | |||
@@ -550,7 +550,8 @@ later is required to fix a server side protocol bug. | |||
550 | old_project_paths = fd.read().split('\n') | 550 | old_project_paths = fd.read().split('\n') |
551 | finally: | 551 | finally: |
552 | fd.close() | 552 | fd.close() |
553 | for path in old_project_paths: | 553 | # In reversed order, so subfolders are deleted before parent folder. |
554 | for path in sorted(old_project_paths, reverse=True): | ||
554 | if not path: | 555 | if not path: |
555 | continue | 556 | continue |
556 | if path not in new_project_paths: | 557 | if path not in new_project_paths: |