Merge "platform_utils_win32: remove an unnecessary workaround"
diff --git a/project.py b/project.py
index 94aa816..e4558e0 100755
--- a/project.py
+++ b/project.py
@@ -1172,10 +1172,11 @@
ref_spec = '%s:refs/%s/%s' % (R_HEADS + branch.name, upload_type,
dest_branch)
+ opts = []
if auto_topic:
- ref_spec = ref_spec + '/' + branch.name
+ opts += ['topic=' + branch.name]
- opts = ['r=%s' % p for p in people[0]]
+ opts += ['r=%s' % p for p in people[0]]
opts += ['cc=%s' % p for p in people[1]]
if notify:
opts += ['notify=' + notify]
@@ -1980,8 +1981,9 @@
if is_sha1 or tag_name is not None:
if self._CheckForImmutableRevision():
- print('Skipped fetching project %s (already have persistent ref)'
- % self.name)
+ if not quiet:
+ print('Skipped fetching project %s (already have persistent ref)'
+ % self.name)
return True
if is_sha1 and not depth:
# When syncing a specific commit and --depth is not set:
@@ -2397,6 +2399,7 @@
if m.Has(key, include_defaults=False):
self.config.SetString(key, m.GetString(key))
self.config.SetString('filter.lfs.smudge', 'git-lfs smudge --skip -- %f')
+ self.config.SetString('filter.lfs.process', 'git-lfs filter-process --skip')
if self.manifest.IsMirror:
self.config.SetString('core.bare', 'true')
else:
@@ -2588,7 +2591,7 @@
cmd.append('-v')
cmd.append(HEAD)
if GitCommand(self, cmd).Wait() != 0:
- raise GitError("cannot initialize work tree")
+ raise GitError("cannot initialize work tree for " + self.name)
if submodules:
self._SyncSubmodules(quiet=True)
@@ -2688,6 +2691,7 @@
def DiffZ(self, name, *args):
cmd = [name]
cmd.append('-z')
+ cmd.append('--ignore-submodules')
cmd.extend(args)
p = GitCommand(self._project,
cmd,
diff --git a/subcmds/info.py b/subcmds/info.py
index ed196e9..f2827b3 100644
--- a/subcmds/info.py
+++ b/subcmds/info.py
@@ -45,7 +45,7 @@
def Execute(self, opt, args):
self.out = _Coloring(self.manifest.globalConfig)
self.heading = self.out.printer('heading', attr = 'bold')
- self.headtext = self.out.printer('headtext', fg = 'yellow')
+ self.headtext = self.out.nofmt_printer('headtext', fg = 'yellow')
self.redtext = self.out.printer('redtext', fg = 'red')
self.sha = self.out.printer("sha", fg = 'yellow')
self.text = self.out.nofmt_printer('text')
diff --git a/subcmds/init.py b/subcmds/init.py
index 9a9e849..632d1a3 100644
--- a/subcmds/init.py
+++ b/subcmds/init.py
@@ -197,6 +197,8 @@
else:
m.PreSync()
+ self._ConfigureDepth(opt)
+
if opt.manifest_url:
r = m.GetRemote(m.remote.name)
r.url = opt.manifest_url
@@ -429,6 +431,4 @@
self._ConfigureUser()
self._ConfigureColor()
- self._ConfigureDepth(opt)
-
self._DisplayResult()
diff --git a/subcmds/sync.py b/subcmds/sync.py
index fafc1e5..ec7337a 100644
--- a/subcmds/sync.py
+++ b/subcmds/sync.py
@@ -550,7 +550,8 @@
old_project_paths = fd.read().split('\n')
finally:
fd.close()
- for path in old_project_paths:
+ # In reversed order, so subfolders are deleted before parent folder.
+ for path in sorted(old_project_paths, reverse=True):
if not path:
continue
if path not in new_project_paths:
