Mercurial > public > mercurial-scm > hg-stable
annotate mercurial/ui.py @ 1839:876e4e6ad82b
Create local ui object per repository, so .hg/hgrc don't get mixed.
This is needed for hooks, but may be important for other settings, too.
Fixes issue113, also integrated push-hook-lock.sh as a test case for this.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Mon, 06 Mar 2006 17:47:41 +0100 |
| parents | 3b1b44b917f4 |
| children | d17f19d84fd3 |
| rev | line source |
|---|---|
| 207 | 1 # ui.py - user interface bits for mercurial |
| 2 # | |
| 3 # Copyright 2005 Matt Mackall <mpm@selenic.com> | |
| 4 # | |
| 5 # This software may be used and distributed according to the terms | |
| 6 # of the GNU General Public License, incorporated herein by reference. | |
| 7 | |
|
613
5374955ec5b1
Demand-load most modules in the commands and ui modules.
Bryan O'Sullivan <bos@serpentine.com>
parents:
608
diff
changeset
|
8 import os, ConfigParser |
|
1400
cf9a1233738a
i18n first part: make '_' available for files who need it
Benoit Boissinot <benoit.boissinot@ens-lyon.org
parents:
1292
diff
changeset
|
9 from i18n import gettext as _ |
|
613
5374955ec5b1
Demand-load most modules in the commands and ui modules.
Bryan O'Sullivan <bos@serpentine.com>
parents:
608
diff
changeset
|
10 from demandload import * |
|
5374955ec5b1
Demand-load most modules in the commands and ui modules.
Bryan O'Sullivan <bos@serpentine.com>
parents:
608
diff
changeset
|
11 demandload(globals(), "re socket sys util") |
| 207 | 12 |
|
1559
59b3639df0a9
Convert all classes to new-style classes by deriving them from object.
Eric Hopper <hopper@omnifarious.org>
parents:
1483
diff
changeset
|
13 class ui(object): |
| 207 | 14 def __init__(self, verbose=False, debug=False, quiet=False, |
|
1839
876e4e6ad82b
Create local ui object per repository, so .hg/hgrc don't get mixed.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1637
diff
changeset
|
15 interactive=True, parentui=None): |
| 960 | 16 self.overlay = {} |
| 285 | 17 self.cdata = ConfigParser.SafeConfigParser() |
|
1839
876e4e6ad82b
Create local ui object per repository, so .hg/hgrc don't get mixed.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1637
diff
changeset
|
18 self.parentui = parentui and parentui.parentui or parentui |
|
876e4e6ad82b
Create local ui object per repository, so .hg/hgrc don't get mixed.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1637
diff
changeset
|
19 if parentui is None: |
|
876e4e6ad82b
Create local ui object per repository, so .hg/hgrc don't get mixed.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1637
diff
changeset
|
20 self.readconfig(util.rcpath) |
| 285 | 21 |
|
1839
876e4e6ad82b
Create local ui object per repository, so .hg/hgrc don't get mixed.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1637
diff
changeset
|
22 self.quiet = self.configbool("ui", "quiet") |
|
876e4e6ad82b
Create local ui object per repository, so .hg/hgrc don't get mixed.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1637
diff
changeset
|
23 self.verbose = self.configbool("ui", "verbose") |
|
876e4e6ad82b
Create local ui object per repository, so .hg/hgrc don't get mixed.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1637
diff
changeset
|
24 self.debugflag = self.configbool("ui", "debug") |
|
876e4e6ad82b
Create local ui object per repository, so .hg/hgrc don't get mixed.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1637
diff
changeset
|
25 self.interactive = self.configbool("ui", "interactive", True) |
| 285 | 26 |
|
1839
876e4e6ad82b
Create local ui object per repository, so .hg/hgrc don't get mixed.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1637
diff
changeset
|
27 self.updateopts(verbose, debug, quiet, interactive) |
|
876e4e6ad82b
Create local ui object per repository, so .hg/hgrc don't get mixed.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1637
diff
changeset
|
28 self.diffcache = None |
|
876e4e6ad82b
Create local ui object per repository, so .hg/hgrc don't get mixed.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1637
diff
changeset
|
29 |
|
876e4e6ad82b
Create local ui object per repository, so .hg/hgrc don't get mixed.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1637
diff
changeset
|
30 def __getattr__(self, key): |
|
876e4e6ad82b
Create local ui object per repository, so .hg/hgrc don't get mixed.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1637
diff
changeset
|
31 return getattr(self.parentui, key) |
| 1071 | 32 |
| 33 def updateopts(self, verbose=False, debug=False, quiet=False, | |
| 34 interactive=True): | |
| 285 | 35 self.quiet = (self.quiet or quiet) and not verbose and not debug |
| 36 self.verbose = (self.verbose or verbose) or debug | |
| 37 self.debugflag = (self.debugflag or debug) | |
| 38 self.interactive = (self.interactive and interactive) | |
| 39 | |
|
1473
7d66ce9895fa
make readconfig take a filename instead of a file pointer as argument
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1440
diff
changeset
|
40 def readconfig(self, fn): |
|
1483
a4ba63e04134
Fix traceback on bad system hgrc files
Soh Tk-r28629 <tksoh@freescale.com>
parents:
1473
diff
changeset
|
41 if isinstance(fn, basestring): |
|
a4ba63e04134
Fix traceback on bad system hgrc files
Soh Tk-r28629 <tksoh@freescale.com>
parents:
1473
diff
changeset
|
42 fn = [fn] |
|
a4ba63e04134
Fix traceback on bad system hgrc files
Soh Tk-r28629 <tksoh@freescale.com>
parents:
1473
diff
changeset
|
43 for f in fn: |
|
a4ba63e04134
Fix traceback on bad system hgrc files
Soh Tk-r28629 <tksoh@freescale.com>
parents:
1473
diff
changeset
|
44 try: |
|
a4ba63e04134
Fix traceback on bad system hgrc files
Soh Tk-r28629 <tksoh@freescale.com>
parents:
1473
diff
changeset
|
45 self.cdata.read(f) |
|
a4ba63e04134
Fix traceback on bad system hgrc files
Soh Tk-r28629 <tksoh@freescale.com>
parents:
1473
diff
changeset
|
46 except ConfigParser.ParsingError, inst: |
|
a4ba63e04134
Fix traceback on bad system hgrc files
Soh Tk-r28629 <tksoh@freescale.com>
parents:
1473
diff
changeset
|
47 raise util.Abort(_("Failed to parse %s\n%s") % (f, inst)) |
| 337 | 48 |
| 960 | 49 def setconfig(self, section, name, val): |
| 50 self.overlay[(section, name)] = val | |
| 51 | |
| 52 def config(self, section, name, default=None): | |
| 53 if self.overlay.has_key((section, name)): | |
| 54 return self.overlay[(section, name)] | |
| 55 if self.cdata.has_option(section, name): | |
| 56 return self.cdata.get(section, name) | |
|
1839
876e4e6ad82b
Create local ui object per repository, so .hg/hgrc don't get mixed.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1637
diff
changeset
|
57 if self.parentui is None: |
|
876e4e6ad82b
Create local ui object per repository, so .hg/hgrc don't get mixed.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1637
diff
changeset
|
58 return default |
|
876e4e6ad82b
Create local ui object per repository, so .hg/hgrc don't get mixed.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1637
diff
changeset
|
59 else: |
|
876e4e6ad82b
Create local ui object per repository, so .hg/hgrc don't get mixed.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1637
diff
changeset
|
60 return self.parentui.config(section, name, default) |
| 285 | 61 |
| 960 | 62 def configbool(self, section, name, default=False): |
| 63 if self.overlay.has_key((section, name)): | |
| 64 return self.overlay[(section, name)] | |
| 65 if self.cdata.has_option(section, name): | |
| 66 return self.cdata.getboolean(section, name) | |
|
1839
876e4e6ad82b
Create local ui object per repository, so .hg/hgrc don't get mixed.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1637
diff
changeset
|
67 if self.parentui is None: |
|
876e4e6ad82b
Create local ui object per repository, so .hg/hgrc don't get mixed.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1637
diff
changeset
|
68 return default |
|
876e4e6ad82b
Create local ui object per repository, so .hg/hgrc don't get mixed.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1637
diff
changeset
|
69 else: |
|
876e4e6ad82b
Create local ui object per repository, so .hg/hgrc don't get mixed.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1637
diff
changeset
|
70 return self.parentui.configbool(section, name, default) |
| 285 | 71 |
| 72 def configitems(self, section): | |
|
1839
876e4e6ad82b
Create local ui object per repository, so .hg/hgrc don't get mixed.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1637
diff
changeset
|
73 items = {} |
|
876e4e6ad82b
Create local ui object per repository, so .hg/hgrc don't get mixed.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1637
diff
changeset
|
74 if self.parentui is not None: |
|
876e4e6ad82b
Create local ui object per repository, so .hg/hgrc don't get mixed.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1637
diff
changeset
|
75 items = dict(self.parentui.configitems(section)) |
| 285 | 76 if self.cdata.has_section(section): |
|
1839
876e4e6ad82b
Create local ui object per repository, so .hg/hgrc don't get mixed.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1637
diff
changeset
|
77 items.update(dict(self.cdata.items(section))) |
|
876e4e6ad82b
Create local ui object per repository, so .hg/hgrc don't get mixed.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1637
diff
changeset
|
78 x = items.items() |
|
876e4e6ad82b
Create local ui object per repository, so .hg/hgrc don't get mixed.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1637
diff
changeset
|
79 x.sort() |
|
876e4e6ad82b
Create local ui object per repository, so .hg/hgrc don't get mixed.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1637
diff
changeset
|
80 return x |
| 285 | 81 |
|
1839
876e4e6ad82b
Create local ui object per repository, so .hg/hgrc don't get mixed.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1637
diff
changeset
|
82 def walkconfig(self, seen=None): |
|
876e4e6ad82b
Create local ui object per repository, so .hg/hgrc don't get mixed.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1637
diff
changeset
|
83 if seen is None: |
|
876e4e6ad82b
Create local ui object per repository, so .hg/hgrc don't get mixed.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1637
diff
changeset
|
84 seen = {} |
|
1028
25e7ea0f2cff
Add commands.debugconfig.
Bryan O'Sullivan <bos@serpentine.com>
parents:
981
diff
changeset
|
85 for (section, name), value in self.overlay.iteritems(): |
|
25e7ea0f2cff
Add commands.debugconfig.
Bryan O'Sullivan <bos@serpentine.com>
parents:
981
diff
changeset
|
86 yield section, name, value |
|
25e7ea0f2cff
Add commands.debugconfig.
Bryan O'Sullivan <bos@serpentine.com>
parents:
981
diff
changeset
|
87 seen[section, name] = 1 |
|
25e7ea0f2cff
Add commands.debugconfig.
Bryan O'Sullivan <bos@serpentine.com>
parents:
981
diff
changeset
|
88 for section in self.cdata.sections(): |
|
25e7ea0f2cff
Add commands.debugconfig.
Bryan O'Sullivan <bos@serpentine.com>
parents:
981
diff
changeset
|
89 for name, value in self.cdata.items(section): |
|
25e7ea0f2cff
Add commands.debugconfig.
Bryan O'Sullivan <bos@serpentine.com>
parents:
981
diff
changeset
|
90 if (section, name) in seen: continue |
|
25e7ea0f2cff
Add commands.debugconfig.
Bryan O'Sullivan <bos@serpentine.com>
parents:
981
diff
changeset
|
91 yield section, name, value.replace('\n', '\\n') |
|
25e7ea0f2cff
Add commands.debugconfig.
Bryan O'Sullivan <bos@serpentine.com>
parents:
981
diff
changeset
|
92 seen[section, name] = 1 |
|
1839
876e4e6ad82b
Create local ui object per repository, so .hg/hgrc don't get mixed.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1637
diff
changeset
|
93 if self.parentui is not None: |
|
876e4e6ad82b
Create local ui object per repository, so .hg/hgrc don't get mixed.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1637
diff
changeset
|
94 for parent in self.parentui.walkconfig(seen): |
|
876e4e6ad82b
Create local ui object per repository, so .hg/hgrc don't get mixed.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1637
diff
changeset
|
95 yield parent |
|
1028
25e7ea0f2cff
Add commands.debugconfig.
Bryan O'Sullivan <bos@serpentine.com>
parents:
981
diff
changeset
|
96 |
| 1071 | 97 def extensions(self): |
| 98 return self.configitems("extensions") | |
| 99 | |
| 1637 | 100 def diffopts(self): |
| 101 if self.diffcache: | |
| 102 return self.diffcache | |
| 103 ret = { 'showfunc' : True, 'ignorews' : False} | |
| 104 for x in self.configitems("diff"): | |
| 105 k = x[0].lower() | |
| 106 v = x[1] | |
| 107 if v: | |
| 108 v = v.lower() | |
| 109 if v == 'true': | |
| 110 value = True | |
| 111 else: | |
| 112 value = False | |
| 113 ret[k] = value | |
| 114 self.diffcache = ret | |
| 115 return ret | |
| 116 | |
|
608
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
565
diff
changeset
|
117 def username(self): |
|
691
61c6b4178b9e
HG environment variables take precedence over hgrc
mpm@selenic.com
parents:
662
diff
changeset
|
118 return (os.environ.get("HGUSER") or |
|
61c6b4178b9e
HG environment variables take precedence over hgrc
mpm@selenic.com
parents:
662
diff
changeset
|
119 self.config("ui", "username") or |
|
608
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
565
diff
changeset
|
120 os.environ.get("EMAIL") or |
|
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
565
diff
changeset
|
121 (os.environ.get("LOGNAME", |
|
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
565
diff
changeset
|
122 os.environ.get("USERNAME", "unknown")) |
|
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
565
diff
changeset
|
123 + '@' + socket.getfqdn())) |
|
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
565
diff
changeset
|
124 |
|
1129
ee4f60abad93
Move generating short username to display in hg/hgweb annotate to ui module.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1071
diff
changeset
|
125 def shortuser(self, user): |
|
ee4f60abad93
Move generating short username to display in hg/hgweb annotate to ui module.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1071
diff
changeset
|
126 """Return a short representation of a user name or email address.""" |
| 1147 | 127 if not self.verbose: |
| 128 f = user.find('@') | |
| 129 if f >= 0: | |
| 130 user = user[:f] | |
| 131 f = user.find('<') | |
| 132 if f >= 0: | |
| 133 user = user[f+1:] | |
|
1129
ee4f60abad93
Move generating short username to display in hg/hgweb annotate to ui module.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1071
diff
changeset
|
134 return user |
|
ee4f60abad93
Move generating short username to display in hg/hgweb annotate to ui module.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1071
diff
changeset
|
135 |
| 1440 | 136 def expandpath(self, loc, root=""): |
| 506 | 137 paths = {} |
| 138 for name, path in self.configitems("paths"): | |
| 1440 | 139 m = path.find("://") |
| 140 if m == -1: | |
| 141 path = os.path.join(root, path) | |
| 506 | 142 paths[name] = path |
| 143 | |
| 144 return paths.get(loc, loc) | |
| 145 | |
| 207 | 146 def write(self, *args): |
| 147 for a in args: | |
| 148 sys.stdout.write(str(a)) | |
| 565 | 149 |
| 150 def write_err(self, *args): | |
|
1609
c50bddfbc812
eliminate backtrace when piping output on windows.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1569
diff
changeset
|
151 if not sys.stdout.closed: sys.stdout.flush() |
| 565 | 152 for a in args: |
| 153 sys.stderr.write(str(a)) | |
| 154 | |
| 207 | 155 def readline(self): |
| 156 return sys.stdin.readline()[:-1] | |
| 1062 | 157 def prompt(self, msg, pat, default="y"): |
| 207 | 158 if not self.interactive: return default |
| 159 while 1: | |
| 160 self.write(msg, " ") | |
| 161 r = self.readline() | |
| 162 if re.match(pat, r): | |
| 163 return r | |
| 164 else: | |
|
1402
9d2c2e6b32b5
i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1400
diff
changeset
|
165 self.write(_("unrecognized response\n")) |
| 207 | 166 def status(self, *msg): |
| 167 if not self.quiet: self.write(*msg) | |
|
234
3427806d5ab9
ui.warn can use more than one argument like the other ui methods.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
207
diff
changeset
|
168 def warn(self, *msg): |
| 565 | 169 self.write_err(*msg) |
| 207 | 170 def note(self, *msg): |
| 171 if self.verbose: self.write(*msg) | |
| 172 def debug(self, *msg): | |
| 173 if self.debugflag: self.write(*msg) | |
| 174 def edit(self, text): | |
| 249 | 175 import tempfile |
| 207 | 176 (fd, name) = tempfile.mkstemp("hg") |
| 177 f = os.fdopen(fd, "w") | |
| 178 f.write(text) | |
| 179 f.close() | |
| 180 | |
|
691
61c6b4178b9e
HG environment variables take precedence over hgrc
mpm@selenic.com
parents:
662
diff
changeset
|
181 editor = (os.environ.get("HGEDITOR") or |
|
61c6b4178b9e
HG environment variables take precedence over hgrc
mpm@selenic.com
parents:
662
diff
changeset
|
182 self.config("ui", "editor") or |
|
608
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
565
diff
changeset
|
183 os.environ.get("EDITOR", "vi")) |
|
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
565
diff
changeset
|
184 |
|
662
b55a78595ef6
Pass username to hgeditor, remove temporary file
Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl>
parents:
613
diff
changeset
|
185 os.environ["HGUSER"] = self.username() |
|
1569
dd186cb70a64
quote the filename when calling HGEDITOR
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1559
diff
changeset
|
186 util.system("%s \"%s\"" % (editor, name), errprefix=_("edit failed")) |
| 207 | 187 |
| 188 t = open(name).read() | |
| 189 t = re.sub("(?m)^HG:.*\n", "", t) | |
| 190 | |
|
662
b55a78595ef6
Pass username to hgeditor, remove temporary file
Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl>
parents:
613
diff
changeset
|
191 os.unlink(name) |
|
b55a78595ef6
Pass username to hgeditor, remove temporary file
Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl>
parents:
613
diff
changeset
|
192 |
| 207 | 193 return t |
|
1839
876e4e6ad82b
Create local ui object per repository, so .hg/hgrc don't get mixed.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1637
diff
changeset
|
194 |