--- a/mercurial/dirstate.py Mon Jun 18 21:30:27 2007 -0500
+++ b/mercurial/dirstate.py Tue Jun 19 08:06:37 2007 +0200
@@ -32,8 +32,8 @@
return self._copymap
elif name == '_branch':
try:
- self._branch = self._opener("branch").read().strip()\
- or "default"
+ self._branch = (self._opener("branch").read().strip()
+ or "default")
except IOError:
self._branch = "default"
return self._branch
@@ -303,7 +303,7 @@
elif stat.S_ISSOCK(st.st_mode): kind = _('socket')
elif stat.S_ISDIR(st.st_mode): kind = _('directory')
self._ui.warn(_('%s: unsupported file type (type is %s)\n')
- % (self.pathto(f), kind))
+ % (self.pathto(f), kind))
return False
def walk(self, files=None, match=util.always, badmatch=None):
@@ -410,8 +410,8 @@
break
if not found:
if inst.errno != errno.ENOENT or not badmatch:
- self._ui.warn('%s: %s\n' % (self.pathto(ff),
- inst.strerror))
+ self._ui.warn('%s: %s\n' %
+ (self.pathto(ff), inst.strerror))
elif badmatch and badmatch(ff) and imatch(nf):
yield 'b', ff, None
continue