Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/hg.py @ 187:aa9a0d50e612

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix two minor merge bugs -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix two minor merge bugs Fix variable name for printing manifest node Trouble with empty between lists from remote repos manifest hash: 000e9267b17c870f673210c8aae50d99e0e5b72b -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCmOmtywK+sNU5EO8RAs7AAJ9dVyOn5Ne+EopdUqOe8IKVH86R3wCfUhNO CLpuRURCB5Ang19YZ5MLGeg= =NF1T -----END PGP SIGNATURE-----
author mpm@selenic.com
date Sat, 28 May 2005 13:59:09 -0800
parents 9a2075c0b9b8
children 3dd5ce2fddb6
comparison
equal deleted inserted replaced
186:9a2075c0b9b8 187:aa9a0d50e612
767 # and manifest id to the changelog 767 # and manifest id to the changelog
768 self.ui.status("committing merge changeset\n") 768 self.ui.status("committing merge changeset\n")
769 if co == cn: cn = -1 769 if co == cn: cn = -1
770 770
771 edittext = "\nHG: merge resolve\n" + \ 771 edittext = "\nHG: merge resolve\n" + \
772 "HG: manifest hash %s\n" % hex(mnode) + \ 772 "HG: manifest hash %s\n" % hex(node) + \
773 "".join(["HG: changed %s\n" % f for f in new]) 773 "".join(["HG: changed %s\n" % f for f in new])
774 edittext = self.ui.edit(edittext) 774 edittext = self.ui.edit(edittext)
775 n = self.changelog.add(node, new, edittext, tr, co, cn) 775 n = self.changelog.add(node, new, edittext, tr, co, cn)
776 776
777 tr.close() 777 tr.close()
832 return br 832 return br
833 833
834 def between(self, pairs): 834 def between(self, pairs):
835 n = "\n".join(["-".join(map(hex, p)) for p in pairs]) 835 n = "\n".join(["-".join(map(hex, p)) for p in pairs])
836 d = self.do_cmd("between", pairs=n).read() 836 d = self.do_cmd("between", pairs=n).read()
837 p = [ map(bin, l.split(" ")) for l in d.splitlines() ] 837 p = [ l and map(bin, l.split(" ")) or [] for l in d.splitlines() ]
838 return p 838 return p
839 839
840 def changegroup(self, nodes): 840 def changegroup(self, nodes):
841 n = " ".join(map(hex, nodes)) 841 n = " ".join(map(hex, nodes))
842 zd = zlib.decompressobj() 842 zd = zlib.decompressobj()