Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/hg.py @ 713:7c385bd5f993

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added missing newline after two error messages. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Added missing newline after two error messages. manifest hash: c730cdf92c66ee5b44a4cd9b67f72deb844e4010 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC2B0mW7P1GVgWeRoRAjXJAJ48fbg6jXN65pBPGW/YmWn9OtKakACgjnr9 DPySaeLr3/bU7KhFdZPI7/4= =Lvsx -----END PGP SIGNATURE-----
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 15 Jul 2005 21:31:35 +0100
parents 574869103985
children fed842bb84b2 c6b912f8b5b2
comparison
equal deleted inserted replaced
712:b4f0fad0ea64 713:7c385bd5f993
214 start = bs 214 start = bs
215 if fn != f: 215 if fn != f:
216 # item not found, insert a new one 216 # item not found, insert a new one
217 end = bs 217 end = bs
218 if w[1] == 1: 218 if w[1] == 1:
219 sys.stderr.write("failed to remove %s from manifest" % f) 219 sys.stderr.write("failed to remove %s from manifest\n"
220 % f)
220 sys.exit(1) 221 sys.exit(1)
221 else: 222 else:
222 # item is found, replace/delete the existing line 223 # item is found, replace/delete the existing line
223 end = bs + 1 224 end = bs + 1
224 delta.append([start, end, offsets[start], offsets[end], l]) 225 delta.append([start, end, offsets[start], offsets[end], l])
229 else: 230 else:
230 cachedelta = None 231 cachedelta = None
231 232
232 text = "".join(self.addlist) 233 text = "".join(self.addlist)
233 if cachedelta and mdiff.patch(self.listcache[0], cachedelta) != text: 234 if cachedelta and mdiff.patch(self.listcache[0], cachedelta) != text:
234 sys.stderr.write("manifest delta failure") 235 sys.stderr.write("manifest delta failure\n")
235 sys.exit(1) 236 sys.exit(1)
236 n = self.addrevision(text, transaction, link, p1, p2, cachedelta) 237 n = self.addrevision(text, transaction, link, p1, p2, cachedelta)
237 self.mapcache = (n, map, flags) 238 self.mapcache = (n, map, flags)
238 self.listcache = (text, self.addlist) 239 self.listcache = (text, self.addlist)
239 self.addlist = None 240 self.addlist = None