# HG changeset patch
# User Vadim Gelfer
# Date 1149202509 25200
# Node ID 8d31c71e814853a6819e84cd6eff5cf0e749aefa
# Parent 609c56df709a884895cc61430f877d8b6bcd6487# Parent 62ce297f214f87fc6b5e67cebc44e2c01b43d6e4
merge with crew.
diff -r 62ce297f214f -r 8d31c71e8148 .hgignore
--- a/.hgignore Thu Jun 01 15:53:43 2006 -0700
+++ b/.hgignore Thu Jun 01 15:55:09 2006 -0700
@@ -24,3 +24,4 @@
syntax: regexp
^\.pc/
+Output/Mercurial-[0-9.]*.exe
diff -r 62ce297f214f -r 8d31c71e8148 contrib/win32/ReadMe.html
--- a/contrib/win32/ReadMe.html Thu Jun 01 15:53:43 2006 -0700
+++ b/contrib/win32/ReadMe.html Thu Jun 01 15:55:09 2006 -0700
@@ -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.
-
-
- - Open the Control Panel. Under Windows XP, select the
- "Classic View".
-
- - Double-click on the "System" control panel.
-
- - Click on the "Advanced" tab.
-
- - Click on "Environment Variables". You'll find this near the
- bottom of the window.
-
- - Under "System variables", you will see "Path". Double-click
- it.
-
- - 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).
-
- - Click on the various "OK" buttons until you've completely
- exited from the System control panel.
-
- - Log out and log back in, or restart your system.
-
- - The next time you run the Windows command prompt, you will be
- able to run the hg command without any special
- help.
-
+ Mercurial command is called hg.exe.
Testing Mercurial after you've installed it
diff -r 62ce297f214f -r 8d31c71e8148 contrib/win32/mercurial.iss
--- a/contrib/win32/mercurial.iss Thu Jun 01 15:53:43 2006 -0700
+++ b/contrib/win32/mercurial.iss Thu Jun 01 15:55:09 2006 -0700
@@ -38,6 +38,7 @@
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 @@
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 -r 62ce297f214f -r 8d31c71e8148 contrib/win32/win32-build.txt
--- a/contrib/win32/win32-build.txt Thu Jun 01 15:53:43 2006 -0700
+++ b/contrib/win32/win32-build.txt Thu Jun 01 15:55:09 2006 -0700
@@ -24,6 +24,9 @@
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 @@
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 -r 62ce297f214f -r 8d31c71e8148 hgext/purge/README
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hgext/purge/README Thu Jun 01 15:55:09 2006 -0700
@@ -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 -r 62ce297f214f -r 8d31c71e8148 hgext/purge/__init__.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hgext/purge/__init__.py Thu Jun 01 15:55:09 2006 -0700
@@ -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 -r 62ce297f214f -r 8d31c71e8148 mercurial/ui.py
--- a/mercurial/ui.py Thu Jun 01 15:53:43 2006 -0700
+++ b/mercurial/ui.py Thu Jun 01 15:55:09 2006 -0700
@@ -148,34 +148,30 @@
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