Mercurial > hg > mercurial-crew-with-dirclash

annotate contrib/sample.hgrc @ 5483:0c43f87baba3 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix file-changed-to-dir and dir-to-file commits (issue660). Allow adding to dirstate files that clash with previously existing but marked for removal. Protect from reintroducing clashes by revert. This change doesn't address related issues with update. Current workaround is to do "clean" update by manually removing conflicting files/dirs from working directory.
author Maxim Dounin <mdounin@mdounin.ru>
date Sat, 27 Oct 2007 16:27:55 +0400
parents 345ed833854d
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2615
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
1 ### --- User interface
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
2
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
3 [ui]
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
4
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
5 ### show changed files and be a bit more verbose if True
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
6
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
7 # verbose = True
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
8
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
9 ### username data to appear in comits
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
10 ### it usually takes the form: Joe User <joe.user@host.com>
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
11
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
12 # username = Joe User <j.user@example.com>
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
13
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
14 ### --- Extensions
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
15
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
16 [extensions]
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
17
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
18 ### each extension has its own 'extension_name=path' line
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
19 ### the default python library path is used when path is left blank
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
20 ### the hgext dir is used when 'hgext.extension_name=' is written
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
21
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
22 ### acl - Access control lists
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
23 ### hg help acl
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
24
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
25 # hgext.acl =
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
26
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
27 ### bisect - binary search changesets to detect bugs
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
28 ### hg help bisect
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
29
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
30 # hgext.hbisect =
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
31
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
32 ### bugzilla - update bugzilla bugs when changesets mention them
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
33 ### hg help bugzilla
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
34
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
35 # hgext.bugzilla =
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
36
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
37 ### extdiff - Use external diff application instead of builtin one
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
38
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
39 # hgext.extdiff =
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
40
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
41 ### gpg - GPG checks and signing
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
42 ### hg help gpg
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
43
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
44 # hgext.gpg =
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
45
4340
345ed833854d Add graphlog extension
Joel Rosdahl <joel@rosdahl.net>
parents: 3938
diff changeset
46 ### graphlog - ASCII graph log
345ed833854d Add graphlog extension
Joel Rosdahl <joel@rosdahl.net>
parents: 3938
diff changeset
47 ### hg help glog
345ed833854d Add graphlog extension
Joel Rosdahl <joel@rosdahl.net>
parents: 3938
diff changeset
48
345ed833854d Add graphlog extension
Joel Rosdahl <joel@rosdahl.net>
parents: 3938
diff changeset
49 # hgext.graphlog =
345ed833854d Add graphlog extension
Joel Rosdahl <joel@rosdahl.net>
parents: 3938
diff changeset
50
2615
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
51 ### hgk - GUI repository browser
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
52 ### hg help view
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
53
3938
20f1c8440c53 sample.hgrc: hgk extension is now in hgext. Use churn as example for contrib.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2615
diff changeset
54 # hgext.hgk =
2615
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
55
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
56 ### mq - Mercurial patch queues
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
57 ### hg help mq
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
58
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
59 # hgext.mq =
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
60
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
61 ### notify - Template driven e-mail notifications
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
62 ### hg help notify
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
63
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
64 # hgext.notify =
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
65
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
66 ### patchbomb - send changesets as a series of patch emails
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
67 ### hg help email
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
68
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
69 # hgext.patchbomb =
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
70
3938
20f1c8440c53 sample.hgrc: hgk extension is now in hgext. Use churn as example for contrib.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2615
diff changeset
71 ### churn - create a graph showing who changed the most lines
20f1c8440c53 sample.hgrc: hgk extension is now in hgext. Use churn as example for contrib.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2615
diff changeset
72 ### hg help churn
20f1c8440c53 sample.hgrc: hgk extension is now in hgext. Use churn as example for contrib.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2615
diff changeset
73
20f1c8440c53 sample.hgrc: hgk extension is now in hgext. Use churn as example for contrib.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2615
diff changeset
74 # hgext.churn = /home/user/hg/hg/contrib/churn.py
20f1c8440c53 sample.hgrc: hgk extension is now in hgext. Use churn as example for contrib.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2615
diff changeset
75
2615
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
76 ### win32text - line ending conversion filters for the Windows platform
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
77
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
78 # hgext.win32text =
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
79
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
80 ### --- hgk additional configuration
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
81
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
82 [hgk]
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
83
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
84 ### set executable path
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
85
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
86 # path = /home/user/hg/hg/contrib/hgk
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
87
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
88 ### --- Hook to Mercurial actions - See hgrc man page for avaliable hooks
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
89
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
90 [hooks]
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
91
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
92 ### Example notify hooks (load hgext.notify extension before use)
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
93
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
94 # incoming.notify = python:hgext.notify.hook
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
95 # changegroup.notify = python:hgext.notify.hook
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
96
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
97 ### Email configuration for the notify and patchbomb extensions
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
98
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
99 [email]
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
100
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
101 ### Your email address
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
102
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
103 # from = user@example.com
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
104
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
105 ### Method to send email - smtp or /usr/sbin/sendmail or other program name
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
106
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
107 # method = smtp
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
108
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
109 ### smtp server to send email to
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
110
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
111 [smtp]
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
112
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
113 # host = mail
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
114 # port = 25
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
115 # tls = false
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
116 # username = user
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
117 # password = blivet
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
118 # local_hostname = myhost
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
119
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
120 ### --- Email notification hook for server
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
121
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
122 [notify]
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
123 ### multiple sources can be specified as a whitespace or comma separated list
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
124
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
125 # sources = serve push pull bundle
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
126
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
127 ### set this to False when you're ready for mail to start sending
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
128
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
129 # test = True
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
130
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
131 ### path to config file with names of subscribers
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
132
b075216da118 contrib: add sample.hgrc
Rafael Villar Burke <pachi@mmn-arquitectos.com>
parents:
diff changeset
133 # config = /path/to/subscription/file