Mercurial > public > mercurial-scm > hg-stable
diff mercurial/byterange.py @ 24803:e89f909edffa stable 3.4-rc
merge default into stable for 3.4 freeze
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 16 Apr 2015 20:57:51 -0500 |
parents | 6ddc86eedc3b |
children | 328739ea70c3 |
line wrap: on
line diff
--- a/mercurial/byterange.py Thu Apr 16 22:33:53 2015 +0900 +++ b/mercurial/byterange.py Thu Apr 16 20:57:51 2015 -0500 @@ -274,7 +274,11 @@ dirs = dirs[1:] try: fw = self.connect_ftp(user, passwd, host, port, dirs) - type = file and 'I' or 'D' + if file: + type = 'I' + else: + type = 'D' + for attr in attrs: attr, value = splitattr(attr) if attr.lower() == 'type' and \