Mercurial > public > mercurial-scm > hg

comparison mercurial/hg.py @ 452:a1e91c24dab5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rawcommit: do lookup of parents at the appropriate layer -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 rawcommit: do lookup of parents at the appropriate layer manifest hash: fc4b2d4416d00da5db2f4659e42ecba2a96dba1e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCu2UoywK+sNU5EO8RApdDAJ9Vph6qVyzL++YeXyFC8HKf9ZhkGgCeNc0Y j2AMu6aWmuLuy2XwztS8gms= =f8mQ -----END PGP SIGNATURE-----
author mpm@selenic.com
date Thu, 23 Jun 2005 17:43:04 -0800
parents 3e2aee6c5500
children 58d57594b802
comparison
equal deleted inserted replaced
451:c9d134165392 452:a1e91c24dab5
476 return lock.lock(self.join("lock"), wait) 476 return lock.lock(self.join("lock"), wait)
477 raise inst 477 raise inst
478 478
479 def rawcommit(self, files, text, user, date, p1=None, p2=None): 479 def rawcommit(self, files, text, user, date, p1=None, p2=None):
480 orig_parent = self.dirstate.parents()[0] or nullid 480 orig_parent = self.dirstate.parents()[0] or nullid
481 p1 = (p1 and self.lookup(p1)) or self.dirstate.parents()[0] or nullid 481 p1 = p1 or self.dirstate.parents()[0] or nullid
482 p2 = (p2 and self.lookup(p2)) or self.dirstate.parents()[1] or nullid 482 p2 = p2 or self.dirstate.parents()[1] or nullid
483 c1 = self.changelog.read(p1) 483 c1 = self.changelog.read(p1)
484 c2 = self.changelog.read(p2) 484 c2 = self.changelog.read(p2)
485 m1 = self.manifest.read(c1[0]) 485 m1 = self.manifest.read(c1[0])
486 mf1 = self.manifest.readflags(c1[0]) 486 mf1 = self.manifest.readflags(c1[0])
487 m2 = self.manifest.read(c2[0]) 487 m2 = self.manifest.read(c2[0])