Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/hg.py @ 725:c6b912f8b5b2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with Matt's tip.
author Bryan O'Sullivan <bos@serpentine.com>
date Tue, 19 Jul 2005 07:00:03 -0800
parents 1c0c413cccdd 7c385bd5f993
children 809a870a0e73
comparison
equal deleted inserted replaced
724:1c0c413cccdd 725:c6b912f8b5b2
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