Mercurial > hg > mercurial-crew-with-dirclash

diff 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
line wrap: on
line diff
--- a/mercurial/hg.py
+++ b/mercurial/hg.py
@@ -478,8 +478,8 @@ class localrepository:
 
     def rawcommit(self, files, text, user, date, p1=None, p2=None):
         orig_parent = self.dirstate.parents()[0] or nullid
-        p1 = (p1 and self.lookup(p1)) or self.dirstate.parents()[0] or nullid
-        p2 = (p2 and self.lookup(p2)) or self.dirstate.parents()[1] or nullid
+        p1 = p1 or self.dirstate.parents()[0] or nullid
+        p2 = p2 or self.dirstate.parents()[1] or nullid
         c1 = self.changelog.read(p1)
         c2 = self.changelog.read(p2)
         m1 = self.manifest.read(c1[0])