Mercurial > hg-stable
changeset 8222:d30a21594812
more whitespace cleanup and some other style nits
| author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
|---|---|
| date | Mon, 27 Apr 2009 12:37:19 +0200 |
| parents | f35b933044cc |
| children | 02145b700fe4 |
| files | hgext/convert/__init__.py hgext/rebase.py mercurial/config.py mercurial/ui.py tests/test-convert.out |
| diffstat | 5 files changed, 10 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/convert/__init__.py Mon Apr 27 12:02:16 2009 +0200 +++ b/hgext/convert/__init__.py Mon Apr 27 12:37:19 2009 +0200 @@ -124,7 +124,7 @@ --config convert.cvsps=builtin and has a few more configurable options: --config convert.cvsps.cache=True (boolean) - Set to False to disable remote log caching, for testing and + Set to False to disable remote log caching, for testing and debugging purposes. --config convert.cvsps.fuzz=60 (integer) Specify the maximum time (in seconds) that is allowed
--- a/hgext/rebase.py Mon Apr 27 12:02:16 2009 +0200 +++ b/hgext/rebase.py Mon Apr 27 12:37:19 2009 +0200 @@ -222,7 +222,7 @@ repo.dirstate.copy(v, k) if v in m2 and v not in m1: repo.dirstate.remove(v) - + newrev = concludenode(repo, rev, p1, p2, state, collapse, extrafn=extrafn)
--- a/mercurial/config.py Mon Apr 27 12:02:16 2009 +0200 +++ b/mercurial/config.py Mon Apr 27 12:37:19 2009 +0200 @@ -20,7 +20,7 @@ for k in src: self[k] = src[k] def items(self): - return [(k,self[k]) for k in self._list] + return [(k, self[k]) for k in self._list] def __delitem__(self, key): dict.__delitem__(self, key) self._list.remove(key)
--- a/mercurial/ui.py Mon Apr 27 12:02:16 2009 +0200 +++ b/mercurial/ui.py Mon Apr 27 12:37:19 2009 +0200 @@ -9,8 +9,8 @@ import errno, getpass, os, re, socket, sys, tempfile import config, traceback, util, error -_booleans = {'1':True, 'yes':True, 'true':True, 'on':True, - '0':False, 'no':False, 'false':False, 'off':False} +_booleans = {'1': True, 'yes': True, 'true': True, 'on': True, + '0': False, 'no': False, 'false': False, 'off': False} class ui(object): def __init__(self, src=None): @@ -34,6 +34,7 @@ # we always trust global config files for f in util.rcpath(): self.readconfig(f, trust=True) + def copy(self): return self.__class__(self) @@ -57,7 +58,7 @@ return False def readconfig(self, filename, root=None, trust=False, - sections = None): + sections=None): try: fp = open(filename) except IOError: @@ -125,7 +126,7 @@ uvalue = self._ucfg.get(section, name) if uvalue is not None and uvalue != value: self.debug(_("ignoring untrusted configuration option " - "%s.%s = %s\n") % (section, name, uvalue)) + "%s.%s = %s\n") % (section, name, uvalue)) return value def configbool(self, section, name, default=False, untrusted=False): @@ -153,7 +154,7 @@ def configitems(self, section, untrusted=False): items = self._data(untrusted).items(section) if self.debugflag and not untrusted and self._reportuntrusted: - for k,v in self._ucfg.items(section): + for k, v in self._ucfg.items(section): if self._tcfg.get(section, k) != v: self.debug(_("ignoring untrusted configuration option " "%s.%s = %s\n") % (section, k, v))
--- a/tests/test-convert.out Mon Apr 27 12:02:16 2009 +0200 +++ b/tests/test-convert.out Mon Apr 27 12:37:19 2009 +0200 @@ -109,7 +109,7 @@ --config convert.cvsps=builtin and has a few more configurable options: --config convert.cvsps.cache=True (boolean) - Set to False to disable remote log caching, for testing and + Set to False to disable remote log caching, for testing and debugging purposes. --config convert.cvsps.fuzz=60 (integer) Specify the maximum time (in seconds) that is allowed