# HG changeset patch # User Vadim Gelfer # Date 1149442174 25200 # Node ID e9d402506514f8cf4bd67424ec554fbc6e57dcc4 # Parent 8d44649df03b744fa6dbd187d0d22d97d918840e# Parent fa4c11751367506265deb5b68fc76c10723a6884 merge change to ssh protocol. diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @@ -24,3 +24,4 @@ mercurial/__version__.py syntax: regexp ^\.pc/ +Output/Mercurial-[0-9.]*.exe diff --git a/contrib/win32/ReadMe.html b/contrib/win32/ReadMe.html --- a/contrib/win32/ReadMe.html +++ b/contrib/win32/ReadMe.html @@ -31,51 +31,7 @@ href="http://www.selenic.com/mercurial">Mercurial web site.

By default, Mercurial installs to C:\Mercurial. The - Mercurial command is called hg.exe. To run this - command, the install directory must be in your search path.

- -

Setting your search path temporarily

- -

To set your search path temporarily, type the following into a - command prompt window:

- - 
-set PATH=C:\Mercurial;%PATH%
-
- -

Setting your search path permanently

- -

To set your search path permanently, perform the following - steps. These instructions are for Windows NT, 2000 and XP.

- -
    -
  1. Open the Control Panel. Under Windows XP, select the - "Classic View".
    2. - -
  2. Double-click on the "System" control panel.
    3. - -
  3. Click on the "Advanced" tab.
    4. - -
  4. Click on "Environment Variables". You'll find this near the - bottom of the window.
    5. - -
  5. Under "System variables", you will see "Path". Double-click - it.
    6. - -
  6. Edit "Variable value". Each path element is separated by a - semicolon (";") character. Append a semicolon to the end of the - list, followed by the path where you installed Mercurial - (e.g. C:\Mercurial).
    7. - -
  7. Click on the various "OK" buttons until you've completely - exited from the System control panel.
    8. - -
  8. Log out and log back in, or restart your system.
    9. - -
  9. The next time you run the Windows command prompt, you will be - able to run the hg command without any special - help.
    10. -
+ Mercurial command is called hg.exe.

Testing Mercurial after you've installed it

diff --git a/contrib/win32/mercurial.iss b/contrib/win32/mercurial.iss --- a/contrib/win32/mercurial.iss +++ b/contrib/win32/mercurial.iss @@ -38,6 +38,7 @@ Source: dist\library.zip; DestDir: {app} Source: dist\mfc71.dll; DestDir: {sys}; Flags: sharedfile uninsnosharedfileprompt Source: dist\msvcr71.dll; DestDir: {sys}; Flags: sharedfile uninsnosharedfileprompt Source: dist\w9xpopen.exe; DestDir: {app} +Source: dist\add_path.exe; DestDir: {app} Source: doc\*.txt; DestDir: {app}\Docs Source: templates\*.*; DestDir: {app}\Templates; Flags: recursesubdirs createallsubdirs Source: CONTRIBUTORS; DestDir: {app}; DestName: Contributors.txt @@ -55,3 +56,9 @@ Type: files; Name: {app}\Mercurial.url Name: {group}\Uninstall Mercurial; Filename: {uninstallexe} Name: {group}\Mercurial Command Reference; Filename: {app}\Docs\hg.1.txt Name: {group}\Mercurial Web Site; Filename: {app}\Mercurial.url + +[Run] +Filename: "{app}\add_path.exe"; Parameters: "{app}"; Flags: postinstall; Description: "Add the installation path to the search path" + +[UninstallRun] +Filename: "{app}\add_path.exe"; Parameters: "/del {app}" diff --git a/contrib/win32/win32-build.txt b/contrib/win32/win32-build.txt --- a/contrib/win32/win32-build.txt +++ b/contrib/win32/win32-build.txt @@ -24,6 +24,9 @@ It has the following prerequisites, at l ISTool http://www.istool.org/default.aspx/ + add_path (you need only add_path.exe in the zip file) + http://www.barisione.org/apps.html#add_path + And, of course, Mercurial itself. Once you have all this installed and built, clone a copy of the @@ -34,7 +37,8 @@ In a shell, build a standalone copy of t python setup.py build -c mingw32 py2exe -b 1 -Copy mfc71.dll into the dist directory that just got created. +Copy mfc71.dll and add_path.exe into the dist directory that just +got created. Run ISTool, and open the C:\hg\hg-release\contrib\win32\mercurial.iss file. diff --git a/doc/hgrc.5.txt b/doc/hgrc.5.txt --- a/doc/hgrc.5.txt +++ b/doc/hgrc.5.txt @@ -165,6 +165,14 @@ extensions:: the path to the ".py" file (including the file name extension) that defines the extension. + Example for ~/.hgrc: + + [extensions] + # (the mq extension will get loaded from mercurial's path) + hgext.mq = + # (this extension will get loaded from the file specified) + myfeature = ~/.hgext/myfeature.py + hooks:: Commands or Python functions that get automatically executed by various actions such as starting or finishing a commit. Multiple diff --git a/hgext/purge/README b/hgext/purge/README new file mode 100644 --- /dev/null +++ b/hgext/purge/README @@ -0,0 +1,60 @@ +What is "hg purge"? +=================== +"purge" is a simple extension for the Mercurial source control management +system (http://www.selenic.com/mercurial). +This extension adds a "purge" command to "hg" that removes files not known +to Mercurial, this is useful to test local and uncommitted changes in the +otherwise clean source tree. + +This means that Mercurial will delete: + - Unknown files: files marked with "?" by "hg status" + - Ignored files: files usually ignored by Mercurial because they match a + pattern in a ".hgignore" file + - Empty directories: infact Mercurial ignores directories unless they + contain files under source control managment +But it will leave untouched: + - Unmodified files tracked by Mercurial + - Modified files tracked by Mercurial + - New files added to the repository (with "hg add") + +Be careful with "hg purge", you could irreversibly delete some files you +forgot to add to the repository. If you only want to print the list of +files that this program would delete use: + hg purge --print + +To get the most recent version of "hg purge" visit its home page: + http://www.barisione.org/apps.html#hg-purge + +This program was inspired by the "cvspurge" script contained in CVS utilities +(http://www.red-bean.com/cvsutils/). + + +How to install +============== +The purge extension is distributed with Mercurial, to activate it you need to +put these lines in your ~/.hgrc: + + [extensions] + hgext.purge= + +For more information on the configuration files see the man page for "hgrc": + man 5 hgrc + + +How to use "hg purge" +==================== +For help on the usage of "hg purge" use: + hg help purge + + +License +======= +Copyright (C) 2006 - Marco Barisione + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +A copy of the GNU General Public License is distributed along +with Mercurial in the file COPYING. diff --git a/hgext/purge/__init__.py b/hgext/purge/__init__.py new file mode 100644 --- /dev/null +++ b/hgext/purge/__init__.py @@ -0,0 +1,179 @@ +#!/usr/bin/env python +# +# Copyright (C) 2006 - Marco Barisione +# +# This is a small extension for Mercurial (http://www.selenic.com/mercurial) +# that removes files not known to mercurial +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +from mercurial import hg, util +import os + +def _(s): + return s + +class Purge(object): + def __init__(self, act=True, abort_on_err=False, eol='\n'): + self._repo = None + self._ui = None + self._hg_root = None + self._act = act + self._abort_on_err = abort_on_err + self._eol = eol + + def purge(self, ui, repo, dirs=None): + self._repo = repo + self._ui = ui + self._hg_root = self._split_path(repo.root) + + if not dirs: + dirs = [repo.root] + + for path in dirs: + path = os.path.abspath(path) + for root, dirs, files in os.walk(path, topdown=False): + if '.hg' in self._split_path(root): + # Skip files in the .hg directory. + # Note that if the repository is in a directory + # called .hg this command does not work. + continue + for name in files: + self._remove_file(os.path.join(root, name)) + if not os.listdir(root): + # Remove this directory if it is empty. + self._remove_dir(root) + + self._repo = None + self._ui = None + self._hg_root = None + + def _error(self, msg): + if self._abort_on_err: + raise util.Abort(msg) + else: + self._ui.warn(_('warning: %s\n') % msg) + + def _remove_file(self, name): + relative_name = self._relative_name(name) + # dirstate.state() requires a path relative to the root + # directory. + if self._repo.dirstate.state(relative_name) != '?': + return + self._ui.note(_('Removing file %s\n') % name) + if self._act: + try: + os.remove(name) + except OSError, e: + self._error(_('%s cannot be removed') % name) + else: + self._ui.write('%s%s' % (name, self._eol)) + + def _remove_dir(self, name): + self._ui.note(_('Removing directory %s\n') % name) + if self._act: + try: + os.rmdir(name) + except OSError, e: + self._error(_('%s cannot be removed') % name) + else: + self._ui.write('%s%s' % (name, self._eol)) + + def _relative_name(self, path): + ''' + Returns "path" but relative to the root directory of the + repository and with '\\' replaced with '/'. + This is needed because this is the format required by + self._repo.dirstate.state(). + ''' + splitted_path = self._split_path(path)[len(self._hg_root):] + # Even on Windows self._repo.dirstate.state() wants '/'. + return self._join_path(splitted_path).replace('\\', '/') + + def _split_path(self, path): + ''' + Returns a list of the single files/directories in "path". + For instance: + '/home/user/test' -> ['/', 'home', 'user', 'test'] + 'C:\\Mercurial' -> ['C:\\', 'Mercurial'] + ''' + ret = [] + while True: + head, tail = os.path.split(path) + if tail: + ret.append(tail) + if head == path: + ret.append(head) + break + path = head + ret.reverse() + return ret + + def _join_path(self, splitted_path): + ''' + Joins a list returned by _split_path(). + ''' + ret = '' + for part in splitted_path: + if ret: + ret = os.path.join(ret, part) + else: + ret = part + return ret + + +def purge(ui, repo, *dirs, **opts): + '''removes files not tracked by mercurial + + Delete files not known to mercurial, this is useful to test local and + uncommitted changes in the otherwise clean source tree. + + This means that purge will delete: + - Unknown files: files marked with "?" by "hg status" + - Ignored files: files usually ignored by Mercurial because they match + a pattern in a ".hgignore" file + - Empty directories: in fact Mercurial ignores directories unless they + contain files under source control managment + But it will leave untouched: + - Unmodified tracked files + - Modified tracked files + - New files added to the repository (with "hg add") + + If directories are given on the command line, only files in these + directories are considered. + + Be careful with purge, you could irreversibly delete some files you + forgot to add to the repository. If you only want to print the list of + files that this program would delete use the --print option. + ''' + act = not opts['print'] + abort_on_err = bool(opts['abort_on_err']) + eol = opts['print0'] and '\0' or '\n' + if eol == '\0': + # --print0 implies --print + act = False + p = Purge(act, abort_on_err, eol) + p.purge(ui, repo, dirs) + + +cmdtable = { + 'purge': + (purge, + [('a', 'abort-on-err', None, _('abort if an error occurs')), + ('p', 'print', None, _('print the file names instead of deleting them')), + ('0', 'print0', None, _('end filenames with NUL, for use with xargs' + ' (implies -p)'))], + _('hg purge [OPTION]... [DIR]...')) +} diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -13,8 +13,7 @@ demandload(globals(), "fancyopts ui hg u demandload(globals(), "fnmatch mdiff random signal tempfile time") demandload(globals(), "traceback errno socket version struct atexit sets bz2") demandload(globals(), "archival changegroup") -demandload(globals(), "mercurial.hgweb.server:create_server") -demandload(globals(), "mercurial.hgweb:hgweb,hgwebdir") +demandload(globals(), "hgweb.server sshserver") class UnknownCommand(Exception): """Exception raised if command is not in the command table.""" @@ -2453,79 +2452,8 @@ def serve(ui, repo, **opts): if opts["stdio"]: if repo is None: raise hg.RepoError(_('no repo found')) - fin, fout = sys.stdin, sys.stdout - sys.stdout = sys.stderr - - # Prevent insertion/deletion of CRs - util.set_binary(fin) - util.set_binary(fout) - - def getarg(): - argline = fin.readline()[:-1] - arg, l = argline.split() - val = fin.read(int(l)) - return arg, val - def respond(v): - fout.write("%d\n" % len(v)) - fout.write(v) - fout.flush() - - lock = None - - while 1: - cmd = fin.readline()[:-1] - if cmd == '': - return - elif cmd == "heads": - h = repo.heads() - respond(" ".join(map(hex, h)) + "\n") - elif cmd == "lock": - lock = repo.lock() - respond("") - elif cmd == "unlock": - if lock: - lock.release() - lock = None - respond("") - elif cmd == "branches": - arg, nodes = getarg() - nodes = map(bin, nodes.split(" ")) - r = [] - for b in repo.branches(nodes): - r.append(" ".join(map(hex, b)) + "\n") - respond("".join(r)) - elif cmd == "between": - arg, pairs = getarg() - pairs = [map(bin, p.split("-")) for p in pairs.split(" ")] - r = [] - for b in repo.between(pairs): - r.append(" ".join(map(hex, b)) + "\n") - respond("".join(r)) - elif cmd == "changegroup": - nodes = [] - arg, roots = getarg() - nodes = map(bin, roots.split(" ")) - - cg = repo.changegroup(nodes, 'serve') - while 1: - d = cg.read(4096) - if not d: - break - fout.write(d) - - fout.flush() - - elif cmd == "addchangegroup": - if not lock: - respond("not locked") - continue - respond("") - - r = repo.addchangegroup(fin, 'serve') - respond(str(r)) - - else: - respond("") + s = sshserver.sshserver(ui, repo) + s.serve_forever() optlist = ("name templates style address port ipv6" " accesslog errorlog webdir_conf") @@ -2547,7 +2475,7 @@ def serve(ui, repo, **opts): os._exit(0) try: - httpd = create_server(ui, repo, hgwebdir, hgweb) + httpd = hgweb.server.create_server(ui, repo) except socket.error, inst: raise util.Abort(_('cannot start server: ') + inst.args[1]) diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py --- a/mercurial/dirstate.py +++ b/mercurial/dirstate.py @@ -14,6 +14,8 @@ from demandload import * demandload(globals(), "time bisect stat util re errno") class dirstate(object): + format = ">cllll" + def __init__(self, opener, ui, root): self.opener = opener self.root = root @@ -164,10 +166,11 @@ class dirstate(object): self.pl = [st[:20], st[20: 40]] pos = 40 + e_size = struct.calcsize(self.format) while pos < len(st): - e = struct.unpack(">cllll", st[pos:pos+17]) + e = struct.unpack(self.format, st[pos:pos+e_size]) l = e[4] - pos += 17 + pos += e_size f = st[pos:pos + l] if '\0' in f: f, c = f.split('\0') @@ -241,7 +244,7 @@ class dirstate(object): c = self.copied(f) if c: f = f + "\0" + c - e = struct.pack(">cllll", e[0], e[1], e[2], e[3], len(f)) + e = struct.pack(self.format, e[0], e[1], e[2], e[3], len(f)) st.write(e + f) self.dirty = 0 diff --git a/mercurial/hgweb/__init__.py b/mercurial/hgweb/__init__.py --- a/mercurial/hgweb/__init__.py +++ b/mercurial/hgweb/__init__.py @@ -1,4 +1,4 @@ -# hgweb.py - web interface to a mercurial repository +# hgweb/__init__.py - web interface to a mercurial repository # # Copyright 21 May 2005 - (c) 2005 Jake Edge # Copyright 2005 Matt Mackall diff --git a/mercurial/hgweb/common.py b/mercurial/hgweb/common.py --- a/mercurial/hgweb/common.py +++ b/mercurial/hgweb/common.py @@ -1,4 +1,4 @@ -# hgweb.py - web interface to a mercurial repository +# hgweb/common.py - Utility functions needed by hgweb_mod and hgwebdir_mod # # Copyright 21 May 2005 - (c) 2005 Jake Edge # Copyright 2005 Matt Mackall diff --git a/mercurial/hgweb/hgweb_mod.py b/mercurial/hgweb/hgweb_mod.py --- a/mercurial/hgweb/hgweb_mod.py +++ b/mercurial/hgweb/hgweb_mod.py @@ -1,4 +1,4 @@ -# hgweb.py - web interface to a mercurial repository +# hgweb/hgweb_mod.py - Web interface for a repository. # # Copyright 21 May 2005 - (c) 2005 Jake Edge # Copyright 2005 Matt Mackall @@ -591,7 +591,6 @@ class hgweb(object): count = cl.count() start = max(0, count - self.maxchanges) end = min(count, start + self.maxchanges) - pos = end - 1 yield self.t("summary", desc = self.repo.ui.config("web", "description", "unknown"), @@ -629,10 +628,10 @@ class hgweb(object): 'zip': ('application/zip', 'zip', '.zip', None), } - def archive(self, req, cnode, type): + def archive(self, req, cnode, type_): reponame = re.sub(r"\W+", "-", os.path.basename(self.reponame)) name = "%s-%s" % (reponame, short(cnode)) - mimetype, artype, extension, encoding = self.archive_specs[type] + mimetype, artype, extension, encoding = self.archive_specs[type_] headers = [('Content-type', mimetype), ('Content-disposition', 'attachment; filename=%s%s' % (name, extension))] @@ -649,7 +648,7 @@ class hgweb(object): def clean(path): p = util.normpath(path) if p[:2] == "..": - raise "suspicious path" + raise Exception("suspicious path") return p def header(**map): @@ -804,11 +803,11 @@ class hgweb(object): elif cmd == 'archive': changeset = self.repo.lookup(req.form['node'][0]) - type = req.form['type'][0] + type_ = req.form['type'][0] allowed = self.repo.ui.config("web", "allow_archive", "").split() - if (type in self.archives and (type in allowed or - self.repo.ui.configbool("web", "allow" + type, False))): - self.archive(req, changeset, type) + if (type_ in self.archives and (type_ in allowed or + self.repo.ui.configbool("web", "allow" + type_, False))): + self.archive(req, changeset, type_) return req.write(self.t("error")) diff --git a/mercurial/hgweb/hgwebdir_mod.py b/mercurial/hgweb/hgwebdir_mod.py --- a/mercurial/hgweb/hgwebdir_mod.py +++ b/mercurial/hgweb/hgwebdir_mod.py @@ -1,4 +1,4 @@ -# hgweb.py - web interface to a mercurial repository +# hgweb/hgwebdir_mod.py - Web interface for a directory of repositories. # # Copyright 21 May 2005 - (c) 2005 Jake Edge # Copyright 2005 Matt Mackall diff --git a/mercurial/hgweb/request.py b/mercurial/hgweb/request.py --- a/mercurial/hgweb/request.py +++ b/mercurial/hgweb/request.py @@ -1,4 +1,4 @@ -# hgweb.py - web interface to a mercurial repository +# hgweb/request.py - An http request from either CGI or the standalone server. # # Copyright 21 May 2005 - (c) 2005 Jake Edge # Copyright 2005 Matt Mackall @@ -7,7 +7,7 @@ # of the GNU General Public License, incorporated herein by reference. from mercurial.demandload import demandload -demandload(globals(), "socket sys cgi os") +demandload(globals(), "socket sys cgi os errno") from mercurial.i18n import gettext as _ class hgrequest(object): diff --git a/mercurial/hgweb/server.py b/mercurial/hgweb/server.py --- a/mercurial/hgweb/server.py +++ b/mercurial/hgweb/server.py @@ -1,4 +1,4 @@ -# hgweb.py - web interface to a mercurial repository +# hgweb/server.py - The standalone hg web server. # # Copyright 21 May 2005 - (c) 2005 Jake Edge # Copyright 2005 Matt Mackall @@ -10,7 +10,7 @@ from mercurial.demandload import demandl import os, sys, errno demandload(globals(), "urllib BaseHTTPServer socket SocketServer") demandload(globals(), "mercurial:ui,hg,util,templater") -demandload(globals(), "mercurial.hgweb.request:hgrequest") +demandload(globals(), "hgweb_mod:hgweb hgwebdir_mod:hgwebdir request:hgrequest") from mercurial.i18n import gettext as _ def _splitURI(uri): @@ -87,7 +87,7 @@ class _hgwebhandler(object, BaseHTTPServ self.send_response(200, "Script output follows") self.server.make_and_run_handler(req) -def create_server(ui, repo, webdirmaker, repoviewmaker): +def create_server(ui, repo): use_threads = True def openlog(opt, default): @@ -123,8 +123,8 @@ def create_server(ui, repo, webdirmaker, self.errorlog = errorlog self.repo = repo self.webdir_conf = webdir_conf - self.webdirmaker = webdirmaker - self.repoviewmaker = repoviewmaker + self.webdirmaker = hgwebdir + self.repoviewmaker = hgweb def make_and_run_handler(self, req): if self.webdir_conf: diff --git a/mercurial/sshserver.py b/mercurial/sshserver.py new file mode 100644 --- /dev/null +++ b/mercurial/sshserver.py @@ -0,0 +1,101 @@ +# commands.py - command processing for mercurial +# +# Copyright 2005 Matt Mackall +# +# This software may be used and distributed according to the terms +# of the GNU General Public License, incorporated herein by reference. + +from demandload import demandload +from i18n import gettext as _ +from node import * +demandload(globals(), "sys util") + +class sshserver(object): + def __init__(self, ui, repo): + self.ui = ui + self.repo = repo + self.lock = None + self.fin = sys.stdin + self.fout = sys.stdout + + sys.stdout = sys.stderr + + # Prevent insertion/deletion of CRs + util.set_binary(self.fin) + util.set_binary(self.fout) + + def getarg(self): + argline = self.fin.readline()[:-1] + arg, l = argline.split() + val = self.fin.read(int(l)) + return arg, val + + def respond(self, v): + self.fout.write("%d\n" % len(v)) + self.fout.write(v) + self.fout.flush() + + def serve_forever(self): + while self.serve_one(): pass + sys.exit(0) + + def serve_one(self): + cmd = self.fin.readline()[:-1] + if cmd: + impl = getattr(self, 'do_' + cmd, None) + if impl: impl() + else: self.respond("") + return cmd != '' + + def do_heads(self): + h = self.repo.heads() + self.respond(" ".join(map(hex, h)) + "\n") + + def do_lock(self): + self.lock = self.repo.lock() + self.respond("") + + def do_unlock(self): + if self.lock: + self.lock.release() + self.lock = None + self.respond("") + + def do_branches(self): + arg, nodes = self.getarg() + nodes = map(bin, nodes.split(" ")) + r = [] + for b in self.repo.branches(nodes): + r.append(" ".join(map(hex, b)) + "\n") + self.respond("".join(r)) + + def do_between(self): + arg, pairs = self.getarg() + pairs = [map(bin, p.split("-")) for p in pairs.split(" ")] + r = [] + for b in self.repo.between(pairs): + r.append(" ".join(map(hex, b)) + "\n") + self.respond("".join(r)) + + def do_changegroup(self): + nodes = [] + arg, roots = self.getarg() + nodes = map(bin, roots.split(" ")) + + cg = self.repo.changegroup(nodes, 'serve') + while True: + d = cg.read(4096) + if not d: + break + self.fout.write(d) + + self.fout.flush() + + def do_addchangegroup(self): + if not self.lock: + self.respond("not locked") + return + + self.respond("") + r = self.repo.addchangegroup(self.fin, 'serve') + self.respond(str(r)) diff --git a/mercurial/ui.py b/mercurial/ui.py --- a/mercurial/ui.py +++ b/mercurial/ui.py @@ -142,37 +142,36 @@ class ui(object): yield parent def extensions(self): - return self.configitems("extensions") + ret = self.configitems("extensions") + for i, (k, v) in enumerate(ret): + if v: ret[i] = (k, os.path.expanduser(v)) + return ret def hgignorefiles(self): - result = [] - cfgitems = self.configitems("ui") - for key, value in cfgitems: - if key == 'ignore' or key.startswith('ignore.'): - path = os.path.expanduser(value) - result.append(path) - return result + ret = [] + for k, v in self.configitems("ui"): + if k == 'ignore' or k.startswith('ignore.'): + ret.append(os.path.expanduser(v)) + return ret def configrevlog(self): ret = {} - for x in self.configitems("revlog"): - k = x[0].lower() - ret[k] = x[1] + for k, v in self.configitems("revlog"): + ret[k.lower()] = v return ret + def diffopts(self): if self.diffcache: return self.diffcache ret = { 'showfunc' : True, 'ignorews' : False} - for x in self.configitems("diff"): - k = x[0].lower() - v = x[1] + for k, v in self.configitems("diff"): if v: v = v.lower() if v == 'true': - value = True + v = True else: - value = False - ret[k] = value + v = False + ret[k.lower()] = v self.diffcache = ret return ret