Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/hgweb.py @ 222:87484f627422

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make pull work for multiple heads -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 make pull work for multiple heads add repository.heads() teach remoterepository and hgweb about heads command teach getchangegroup about multiple heads break apart addchangegroup and merge (cleaning up merge saved for later) after this change, it is now possible to pull and get multiple heads, but not possible to merge the heads manifest hash: 86fe3ede296254698fdd4c97df02944993ef2cbb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCn8SZywK+sNU5EO8RAkSvAJ9NOA4UZ3cFyyzymlYBZnV+PpGRcACeLL+R PFaSgJHGKvxsXpvPYiZA0O0= =L2Xr -----END PGP SIGNATURE-----
author mpm@selenic.com
date Thu, 02 Jun 2005 18:46:49 -0800
parents 9ff5a78d0c45
children 4f802588cdfb 4f802588cdfb 3b92f8fe47ae
comparison
equal deleted inserted replaced
221:2bfe525ef6ca 222:87484f627422
606 write(self.fileannotate(args['file'][0], args['filenode'][0])) 606 write(self.fileannotate(args['file'][0], args['filenode'][0]))
607 607
608 elif args['cmd'][0] == 'filelog': 608 elif args['cmd'][0] == 'filelog':
609 write(self.filelog(args['file'][0], args['filenode'][0])) 609 write(self.filelog(args['file'][0], args['filenode'][0]))
610 610
611 elif args['cmd'][0] == 'heads':
612 httphdr("text/plain")
613 h = self.repo.heads()
614 sys.stdout.write(" ".join(map(hex, h)) + "\n")
615
611 elif args['cmd'][0] == 'branches': 616 elif args['cmd'][0] == 'branches':
612 httphdr("text/plain") 617 httphdr("text/plain")
613 nodes = [] 618 nodes = []
614 if args.has_key('nodes'): 619 if args.has_key('nodes'):
615 nodes = map(bin, args['nodes'][0].split(" ")) 620 nodes = map(bin, args['nodes'][0].split(" "))