annotate doc/hgmerge.1.txt @ 599:765182a4c843

[PATCH] Add RSS support to hgweb -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Add RSS support to hgweb From: Goffredo Baroncelli <kreijack@libero.it> with the two small patches below, now hgweb can act as feed source. Two kinds ofobjects can be tracked: the changelong and the files. This can be useful if anyone would track the changes of a file ( and because git has it, mercurial have to has ). To check the changelog the url is http://127.0.0.1:8000/pippo.pluto?cmd=changelog;style=rss To check a file ( the mercurial/hgweb.py for examples ) the url is http://127.0.0.1:8000/?cmd=filelog;file=mercurial/hgweb.py;filenode=0;style=rss The first patch adds a new filter for the template: the filter is named rfc822date, and translates the date from the touple format to a rfc822 style date. The second patch adds the templates needed to create the rss pages. Tested with akgregator ( kde ). [tweaked by mpm: add Content-type: text/xml add support for URL to header() add header with link and content type add RSS links on the normal pages] manifest hash: 170c03d50490d7160097f59abdde1a5073d2ba82 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCyFmLywK+sNU5EO8RApkrAKCYF/vZ3DwdMXPBds2LxGEX8+tK5QCfTeOc ZhPN8Xjt2cD3wMbNXMcoNSo= =COlM -----END PGP SIGNATURE-----
author mpm@selenic.com
date Sun, 03 Jul 2005 13:32:59 -0800
parents c084cfbb2389
children 3ab6e55ee361
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
466
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
1 HGMERGE(1)
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
2 ==========
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
3 Matt Mackall <mpm@selenic.com>
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
4 v0.1, 27 May 2005
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
5
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
6 NAME
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
7 ----
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
8 hgmerge - default wrapper to merge files in Mercurial SCM system
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
9
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
10 SYNOPSIS
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
11 --------
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
12 'hgmerge' local ancestor remote
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
13
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
14 DESCRIPTION
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
15 -----------
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
16 The hgmerge(1) command provides a graphical interface to merge files in the
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
17 Mercurial system. It is a simple wrapper around kdiff3, merge(1) and tkdiff(1),
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
18 or simply diff(1) and patch(1) depending on what is present on the system.
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
19
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
20 hgmerge(1) is used by the Mercurial SCM if the environment variable HGMERGE is
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
21 not set.
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
22
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
23 AUTHOR
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
24 ------
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
25 Written by Vincent Danjean <Vincent.Danjean@free.fr>
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
26
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
27 SEE ALSO
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
28 --------
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
29 hg(1) - the command line interface to Mercurial SCM
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
30
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
31 COPYING
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
32 -------
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
33 Copyright (C) 2005 Matt Mackall.
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
34 Free use of this software is granted under the terms of the GNU General
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
35 Public License (GPL).