diff mercurial/hgweb.py @ 222:87484f627422

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
line wrap: on
line diff
--- a/mercurial/hgweb.py	Thu Jun 02 18:07:01 2005 -0800
+++ b/mercurial/hgweb.py	Thu Jun 02 18:46:49 2005 -0800
@@ -608,6 +608,11 @@
         elif args['cmd'][0] == 'filelog':
             write(self.filelog(args['file'][0], args['filenode'][0]))
 
+        elif args['cmd'][0] == 'heads':
+            httphdr("text/plain")
+            h = self.repo.heads()
+            sys.stdout.write(" ".join(map(hex, h)) + "\n")
+
         elif args['cmd'][0] == 'branches':
             httphdr("text/plain")
             nodes = []