Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/hg.py @ 288:97c87ac6d7a4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit: edit text fixups -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 commit: edit text fixups if given text, don't call editor if editor returned only whitespace, abort manifest hash: 7b6158a37568d91be1443b487d0a2cea1ba55dd3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCp4zXywK+sNU5EO8RAqCrAJ921nNgI/akM8oacXewkIYdxaoiAgCffOP5 UOIl4GzvkOkcqd5YFS83pa8= =seZT -----END PGP SIGNATURE-----
author mpm@selenic.com
date Wed, 08 Jun 2005 16:27:03 -0800
parents cd6a462ed1e1
children 2c4f2be05587
comparison
equal deleted inserted replaced
287:cd6a462ed1e1 288:97c87ac6d7a4
491 491
492 # add changeset 492 # add changeset
493 new = new.keys() 493 new = new.keys()
494 new.sort() 494 new.sort()
495 495
496 edittext = text + "\n" + "HG: manifest hash %s\n" % hex(mn) 496 if not text:
497 edittext += "".join(["HG: changed %s\n" % f for f in new]) 497 edittext = "\n" + "HG: manifest hash %s\n" % hex(mn)
498 edittext += "".join(["HG: removed %s\n" % f for f in remove]) 498 edittext += "".join(["HG: changed %s\n" % f for f in new])
499 edittext = self.ui.edit(edittext) 499 edittext += "".join(["HG: removed %s\n" % f for f in remove])
500 500 edittext = self.ui.edit(edittext)
501 if not edittext: 501 if not edittext.rstrip():
502 return 1 502 return 1
503 503 text = edittext
504 n = self.changelog.add(mn, new, edittext, tr, p1, p2) 504
505 n = self.changelog.add(mn, new, text, tr, p1, p2)
505 tr.close() 506 tr.close()
506 507
507 self.dirstate.setparents(n) 508 self.dirstate.setparents(n)
508 self.dirstate.update(new, "n") 509 self.dirstate.update(new, "n")
509 self.dirstate.forget(remove) 510 self.dirstate.forget(remove)