Mercurial > hg > mercurial-crew-with-dirclash
annotate mercurial/ui.py @ 653:94cdd02792b5
Fix corruption resulting from skipping parts of a revision group
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Fix corruption resulting from skipping parts of a revision group
We were occassionally losing track of what revision a delta applied to
when we skipped over deltas we already had and applying the delta
against the wrong base. This could result in coredumps from mpatch,
consistency errors, or failed verify.
manifest hash: fcf20a8abfd81f08fae2398136b2ed66216b2083
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCzu5SywK+sNU5EO8RAi10AJ9cqIfQzOzbcdH36t1LR/rY+UMtHwCeM79p
Dtv+Jh0McLZr6nf4iJyhDgI=
=5o6U
-----END PGP SIGNATURE-----
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Fri, 08 Jul 2005 13:21:22 -0800 |
| parents | 5374955ec5b1 |
| children | b55a78595ef6 |
| 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 |
|
5374955ec5b1
Demand-load most modules in the commands and ui modules.
Bryan O'Sullivan <bos@serpentine.com>
parents:
608
diff
changeset
|
9 from demandload import * |
|
5374955ec5b1
Demand-load most modules in the commands and ui modules.
Bryan O'Sullivan <bos@serpentine.com>
parents:
608
diff
changeset
|
10 demandload(globals(), "re socket sys util") |
| 207 | 11 |
| 12 class ui: | |
| 13 def __init__(self, verbose=False, debug=False, quiet=False, | |
| 14 interactive=True): | |
| 285 | 15 self.cdata = ConfigParser.SafeConfigParser() |
| 16 self.cdata.read(os.path.expanduser("~/.hgrc")) | |
| 17 | |
| 18 self.quiet = self.configbool("ui", "quiet") | |
| 19 self.verbose = self.configbool("ui", "verbose") | |
| 20 self.debugflag = self.configbool("ui", "debug") | |
| 21 self.interactive = self.configbool("ui", "interactive", True) | |
| 22 | |
| 23 self.quiet = (self.quiet or quiet) and not verbose and not debug | |
| 24 self.verbose = (self.verbose or verbose) or debug | |
| 25 self.debugflag = (self.debugflag or debug) | |
| 26 self.interactive = (self.interactive and interactive) | |
| 27 | |
| 337 | 28 def readconfig(self, fp): |
| 29 self.cdata.readfp(fp) | |
| 30 | |
| 285 | 31 def config(self, section, val, default=None): |
| 32 if self.cdata.has_option(section, val): | |
| 33 return self.cdata.get(section, val) | |
| 34 return default | |
| 35 | |
| 36 def configbool(self, section, val, default=False): | |
| 37 if self.cdata.has_option(section, val): | |
| 38 return self.cdata.getboolean(section, val) | |
| 39 return default | |
| 40 | |
| 41 def configitems(self, section): | |
| 42 if self.cdata.has_section(section): | |
| 43 return self.cdata.items(section) | |
| 44 return [] | |
| 45 | |
|
608
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
565
diff
changeset
|
46 def username(self): |
|
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
565
diff
changeset
|
47 return (self.config("ui", "username") or |
|
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
565
diff
changeset
|
48 os.environ.get("HGUSER") or |
|
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
565
diff
changeset
|
49 os.environ.get("EMAIL") or |
|
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
565
diff
changeset
|
50 (os.environ.get("LOGNAME", |
|
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
565
diff
changeset
|
51 os.environ.get("USERNAME", "unknown")) |
|
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
565
diff
changeset
|
52 + '@' + socket.getfqdn())) |
|
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
565
diff
changeset
|
53 |
| 506 | 54 def expandpath(self, loc): |
| 55 paths = {} | |
| 56 for name, path in self.configitems("paths"): | |
| 57 paths[name] = path | |
| 58 | |
| 59 return paths.get(loc, loc) | |
| 60 | |
| 207 | 61 def write(self, *args): |
| 62 for a in args: | |
| 63 sys.stdout.write(str(a)) | |
| 565 | 64 |
| 65 def write_err(self, *args): | |
| 66 sys.stdout.flush() | |
| 67 for a in args: | |
| 68 sys.stderr.write(str(a)) | |
| 69 | |
| 207 | 70 def readline(self): |
| 71 return sys.stdin.readline()[:-1] | |
| 72 def prompt(self, msg, pat, default = "y"): | |
| 73 if not self.interactive: return default | |
| 74 while 1: | |
| 75 self.write(msg, " ") | |
| 76 r = self.readline() | |
| 77 if re.match(pat, r): | |
| 78 return r | |
| 79 else: | |
| 80 self.write("unrecognized response\n") | |
| 81 def status(self, *msg): | |
| 82 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
|
83 def warn(self, *msg): |
| 565 | 84 self.write_err(*msg) |
| 207 | 85 def note(self, *msg): |
| 86 if self.verbose: self.write(*msg) | |
| 87 def debug(self, *msg): | |
| 88 if self.debugflag: self.write(*msg) | |
| 89 def edit(self, text): | |
| 249 | 90 import tempfile |
| 207 | 91 (fd, name) = tempfile.mkstemp("hg") |
| 92 f = os.fdopen(fd, "w") | |
| 93 f.write(text) | |
| 94 f.close() | |
| 95 | |
|
608
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
565
diff
changeset
|
96 editor = (self.config("ui", "editor") or |
|
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
565
diff
changeset
|
97 os.environ.get("HGEDITOR") or |
|
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
565
diff
changeset
|
98 os.environ.get("EDITOR", "vi")) |
|
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
565
diff
changeset
|
99 |
| 508 | 100 util.system("%s %s" % (editor, name), errprefix = "edit failed") |
| 207 | 101 |
| 102 t = open(name).read() | |
| 103 t = re.sub("(?m)^HG:.*\n", "", t) | |
| 104 | |
| 105 return t |