Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/hg.py @ 287:cd6a462ed1e1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit: abort with empty commit text -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 commit: abort with empty commit text manifest hash: d932ca95c920d6a4d33281d29e605c6995930016 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCp4oLywK+sNU5EO8RAulBAKCOhHn6p/xNaJUFs/IsOY8+1ad3ZQCfbUNb XigHO+zgvzzsFWIvLnZFiGI= =lldi -----END PGP SIGNATURE-----
author mpm@selenic.com
date Wed, 08 Jun 2005 16:15:07 -0800
parents d7c2efd0b541
children 97c87ac6d7a4
comparison
equal deleted inserted replaced
286:bd9d1e93f8d6 287:cd6a462ed1e1
495 495
496 edittext = text + "\n" + "HG: manifest hash %s\n" % hex(mn) 496 edittext = text + "\n" + "HG: manifest hash %s\n" % hex(mn)
497 edittext += "".join(["HG: changed %s\n" % f for f in new]) 497 edittext += "".join(["HG: changed %s\n" % f for f in new])
498 edittext += "".join(["HG: removed %s\n" % f for f in remove]) 498 edittext += "".join(["HG: removed %s\n" % f for f in remove])
499 edittext = self.ui.edit(edittext) 499 edittext = self.ui.edit(edittext)
500
501 if not edittext:
502 return 1
500 503
501 n = self.changelog.add(mn, new, edittext, tr, p1, p2) 504 n = self.changelog.add(mn, new, edittext, tr, p1, p2)
502 tr.close() 505 tr.close()
503 506
504 self.dirstate.setparents(n) 507 self.dirstate.setparents(n)