Show More
@@ -76,10 +76,9 b' class gpg(object):' | |||||
76 | fp = os.fdopen(fd, r'wb') |
|
76 | fp = os.fdopen(fd, r'wb') | |
77 | fp.write(data) |
|
77 | fp.write(data) | |
78 | fp.close() |
|
78 | fp.close() | |
79 | gpgcmd = b"%s --logger-fd 1 --status-fd 1 --verify \"%s\" \"%s\"" % ( |
|
79 | gpgcmd = ( | |
80 | self.path, |
|
80 | b"%s --logger-fd 1 --status-fd 1 --verify \"%s\" \"%s\"" | |
81 | sigfile, |
|
81 | % (self.path, sigfile, datafile,) | |
82 | datafile, |
|
|||
83 | ) |
|
82 | ) | |
84 | ret = procutil.filter(b"", gpgcmd) |
|
83 | ret = procutil.filter(b"", gpgcmd) | |
85 | finally: |
|
84 | finally: |
@@ -212,11 +212,9 b' class config(object):' | |||||
212 | def read(self, path, fp=None, sections=None, remap=None): |
|
212 | def read(self, path, fp=None, sections=None, remap=None): | |
213 | if not fp: |
|
213 | if not fp: | |
214 | fp = util.posixfile(path, b'rb') |
|
214 | fp = util.posixfile(path, b'rb') | |
215 | assert ( |
|
215 | assert getattr(fp, 'mode', r'rb') == r'rb', ( | |
216 | getattr(fp, 'mode', r'rb') == r'rb' |
|
216 | b'config files must be opened in binary mode, got fp=%r mode=%r' | |
217 | ), b'config files must be opened in binary mode, got fp=%r mode=%r' % ( |
|
217 | % (fp, fp.mode,) | |
218 | fp, |
|
|||
219 | fp.mode, |
|
|||
220 | ) |
|
218 | ) | |
221 | self.parse( |
|
219 | self.parse( | |
222 | path, fp.read(), sections=sections, remap=remap, include=self.read |
|
220 | path, fp.read(), sections=sections, remap=remap, include=self.read |
@@ -1187,10 +1187,9 b' class filectx(basefilectx):' | |||||
1187 |
|
1187 | |||
1188 | assert ( |
|
1188 | assert ( | |
1189 | changeid is not None or fileid is not None or changectx is not None |
|
1189 | changeid is not None or fileid is not None or changectx is not None | |
1190 | ), b"bad args: changeid=%r, fileid=%r, changectx=%r" % ( |
|
1190 | ), ( | |
1191 | changeid, |
|
1191 | b"bad args: changeid=%r, fileid=%r, changectx=%r" | |
1192 | fileid, |
|
1192 | % (changeid, fileid, changectx,) | |
1193 | changectx, |
|
|||
1194 | ) |
|
1193 | ) | |
1195 |
|
1194 | |||
1196 | if filelog is not None: |
|
1195 | if filelog is not None: |
@@ -867,13 +867,16 b' class treemanifest(object):' | |||||
867 | return not self._dirs or all(m._isempty() for m in self._dirs.values()) |
|
867 | return not self._dirs or all(m._isempty() for m in self._dirs.values()) | |
868 |
|
868 | |||
869 | def __repr__(self): |
|
869 | def __repr__(self): | |
870 | return b'<treemanifest dir=%s, node=%s, loaded=%s, dirty=%s at 0x%x>' % ( |
|
870 | return ( | |
|
871 | b'<treemanifest dir=%s, node=%s, loaded=%s, dirty=%s at 0x%x>' | |||
|
872 | % ( | |||
871 | self._dir, |
|
873 | self._dir, | |
872 | hex(self._node), |
|
874 | hex(self._node), | |
873 | bool(self._loadfunc is _noop), |
|
875 | bool(self._loadfunc is _noop), | |
874 | self._dirty, |
|
876 | self._dirty, | |
875 | id(self), |
|
877 | id(self), | |
876 | ) |
|
878 | ) | |
|
879 | ) | |||
877 |
|
880 | |||
878 | def dir(self): |
|
881 | def dir(self): | |
879 | '''The directory that this tree manifest represents, including a |
|
882 | '''The directory that this tree manifest represents, including a |
@@ -3116,9 +3116,7 b' class TestRunner(object):' | |||||
3116 | vlog("# Using HGTMP", _strpath(self._hgtmp)) |
|
3116 | vlog("# Using HGTMP", _strpath(self._hgtmp)) | |
3117 | vlog("# Using PATH", os.environ["PATH"]) |
|
3117 | vlog("# Using PATH", os.environ["PATH"]) | |
3118 | vlog( |
|
3118 | vlog( | |
3119 | "# Using", |
|
3119 | "# Using", _strpath(IMPL_PATH), _strpath(osenvironb[IMPL_PATH]), | |
3120 | _strpath(IMPL_PATH), |
|
|||
3121 | _strpath(osenvironb[IMPL_PATH]), |
|
|||
3122 | ) |
|
3120 | ) | |
3123 | vlog("# Writing to directory", _strpath(self._outputdir)) |
|
3121 | vlog("# Writing to directory", _strpath(self._outputdir)) | |
3124 |
|
3122 |
General Comments 0
You need to be logged in to leave comments.
Login now