Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/localrepo.py @ 3375:9fe62e2db71d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rawcommit: add removed files to the changelog file list patch by tonfa.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Thu, 12 Oct 2006 19:26:06 -0300
parents 929d04962115
children 028fff46a4ac
comparison
equal deleted inserted replaced
3374:b9a7c07fca0e 3375:9fe62e2db71d
508 c1 = self.changelog.read(p1) 508 c1 = self.changelog.read(p1)
509 c2 = self.changelog.read(p2) 509 c2 = self.changelog.read(p2)
510 m1 = self.manifest.read(c1[0]).copy() 510 m1 = self.manifest.read(c1[0]).copy()
511 m2 = self.manifest.read(c2[0]) 511 m2 = self.manifest.read(c2[0])
512 changed = [] 512 changed = []
513 removed = []
513 514
514 if orig_parent == p1: 515 if orig_parent == p1:
515 update_dirstate = 1 516 update_dirstate = 1
516 else: 517 else:
517 update_dirstate = 0 518 update_dirstate = 0
528 except IOError: 529 except IOError:
529 try: 530 try:
530 del m1[f] 531 del m1[f]
531 if update_dirstate: 532 if update_dirstate:
532 self.dirstate.forget([f]) 533 self.dirstate.forget([f])
534 removed.append(f)
533 except: 535 except:
534 # deleted from p2? 536 # deleted from p2?
535 pass 537 pass
536 538
537 mnode = self.manifest.add(m1, tr, linkrev, c1[0], c2[0]) 539 mnode = self.manifest.add(m1, tr, linkrev, c1[0], c2[0])
538 user = user or self.ui.username() 540 user = user or self.ui.username()
539 n = self.changelog.add(mnode, changed, text, tr, p1, p2, user, date) 541 n = self.changelog.add(mnode, changed + removed, text,
542 tr, p1, p2, user, date)
540 tr.close() 543 tr.close()
541 if update_dirstate: 544 if update_dirstate:
542 self.dirstate.setparents(n, nullid) 545 self.dirstate.setparents(n, nullid)
543 546
544 def commit(self, files=None, text="", user=None, date=None, 547 def commit(self, files=None, text="", user=None, date=None,