Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/localrepo.py @ 2853:e3fb4223e750

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove manifest.readflags
author Matt Mackall <mpm@selenic.com>
date Fri, 11 Aug 2006 11:00:38 -0500
parents 046a8b03ea59
children 18cf5349a361
comparison
equal deleted inserted replaced
2852:046a8b03ea59 2853:e3fb4223e750
507 self.dirstate.forget([f]) 507 self.dirstate.forget([f])
508 except: 508 except:
509 # deleted from p2? 509 # deleted from p2?
510 pass 510 pass
511 511
512 mnode = self.manifest.add(m1, m1, tr, linkrev, c1[0], c2[0]) 512 mnode = self.manifest.add(m1, tr, linkrev, c1[0], c2[0])
513 user = user or self.ui.username() 513 user = user or self.ui.username()
514 n = self.changelog.add(mnode, changed, text, tr, p1, p2, user, date) 514 n = self.changelog.add(mnode, changed, text, tr, p1, p2, user, date)
515 tr.close() 515 tr.close()
516 if update_dirstate: 516 if update_dirstate:
517 self.dirstate.setparents(n, nullid) 517 self.dirstate.setparents(n, nullid)
595 # update manifest 595 # update manifest
596 m1.update(new) 596 m1.update(new)
597 for f in remove: 597 for f in remove:
598 if f in m1: 598 if f in m1:
599 del m1[f] 599 del m1[f]
600 mn = self.manifest.add(m1, m1, tr, linkrev, c1[0], c2[0], 600 mn = self.manifest.add(m1, tr, linkrev, c1[0], c2[0],
601 (new, remove)) 601 (new, remove))
602 602
603 # add changeset 603 # add changeset
604 new = new.keys() 604 new = new.keys()
605 new.sort() 605 new.sort()