Merge with TAH

hgweb: fix traceback by skipping invalid repo paths

Fix line wrapping

Added --date option to annotate.

copy the mode of the file when breaking hardlinks

Allow ambiguous command shortcut if only an alias for the same command. Currently the only example for this is 'hg o' or 'hg ou' as a shortcut for 'hg out' and 'hg outgoing'.

Merge with TAH

Improved error message for ambiguous command shortcuts.

Canonicalize command when using aliases or prefix matching. This makes the norepo check and the help and version command work when not using the canonical name.

Automatically run "verify" whenever we run "recover"

Fix up test-help, mark test-rename +x

avoid to copy more than one file to the same destination file

copy & rename don't overwrite unless --force is specified

generalize copy/rename to handle more than one source directory

hgweb: remove redundant rstrip filter

use self.{w,}join when possible

Add safety check for addgroup

fix a warning when py2exe is not used

Add explicit 'st' alias for status

if unambigious command name are passed, use them

Add support for -r option in hg tag

fix file opening for some commands on Windows Using file as opener in debug commands won't work on Windows, as the index and data files needs to be opened in binary mode.

Merge with TAH

Fixed test-static-http with http_proxy variable set again.

Merge from Hidetaka Iwai

Fixed to convert to man properly.

Fixed wrong encoding of files.

hgweb: Added archive download buttons to manifest page.

Add permissions handling test

remove the deprecated --text (t) option to rawcommit and tag

Deal with merge abort more gracefully We save parent info last rather than first.

Handle empty logs in repo.checksize

verify: add check for mismatch of index and data length

Allow interrupting all parts of verify

fix a bug in dirstate.changes when cwd != repo.root - use lstat instead of stat - add a testcase (thanks to Johannes Hofmann)

minor doc fix

Added Japanese translations of manpages.

only files in normal state should be marked as deleted fix a traceback when you removed an added file

fix handling of files of unsupported type in the walk code if a file was of unsupported type, it was considered as 'seen' while walking. this way it was possible to have file in the dirstate not yielded by the walk function.

zsh: allow 'hg clone' to complete paths listed in ~/.hgrc

mention running multiple hooks in the doc

zsh completion improvements. File completers now correctly deal with filenames that contain spaces. The completers also use 'hg status .' so they'll work correctly when the default behaviour changes.

Fix traceback on bad system hgrc files

fix handling of daylight saving time

Change test-hook to test multiple hooks

allow multiples hook suggested by Vadim Gelfer This patch allows to have multiple hooks of the same kind: for example commit.email = /my/email/hook commit.autobuild = /my/build/hook

fix a bug where hg could remove file ending with .tmp util.opener used a fixed filename for writing tempfile instead of using the tempfile module.

add a test for hgignore

util.opener already create the base directory if it doesn't exist

fix dirstate.change: it should walk ignored files

Elevate parents to a "common" command in help

Add missing test output

make readconfig take a filename instead of a file pointer as argument catch parse error while reading a config file add a testcase for parse error

make revert use standard matcher

rewrote changes function in dirstate to use generic walk code now, file with unsupported type will not show up in status anymore

minor fix on command help docstrings

Merge bundle -r work from Eric Hopper

Added a test for clone -r.

Stupid spelling mistake in a variable name.

Added a lot of comments to changegroupsubset.

Implementing pull -r and changing clone -r. Both now support multiple 'target' revisions.

Fixed silly bug involving a non-existent variable.

Fix to handle case of empty list for roots or heads in nodesbetween.

Optimizing manifest reads in changegroupsubset by using deltas.

Implementing clone -r, which clones all changesets needed to reach a particular revision.

Bug fixing in localrepository.changegroupsubset. Bugs found in testing.

Fix small bug in nodesbetween if heads is [nullid].

This changes the revlog.group and re-implements the localrepo.changeroup function in terms of it. revlog.group now takes a list of nodes, and some callback functions instead of a linkmap.

This implements the nodesbetween method, and it removes the newer method and replaces it with calls to nodesbetween. nodesbetween calculates all the changesets needed to have a complete revision graph between a given set of base nodes and a given set of head nodes.

Remove copy/rename --parents option This is no longer needed now that we have more standard UNIX-like copy semantics.

[PATCH] copy/rename a directory This patch adds support for 'hg copy dir1 dir2' or 'hg rename dir1 dir2'. When "dir2" exists, "dir1" is recursively copied (or moved) to "dir2/dir1". When "dir2" does not exists, "dir1" is copied to (renamed as) "dir2".

further fix traceback on invalid .hgignore patterns Please apply this little fix (matchfn return None if no patterns are specified).

get command defaults from hgrc

Remove now unused sortdiff and diff from mdiff

Remove old manifest diff code, it's now buggy

Add Benoit to CONTRIBUTORS

Add test-confused-revert, fix permissions on test-revert

Allow reverting a deleted file with two parents As elsewhere, we choose the first parent by default

revert added and removed files to their normal state before reverting add a test for revert

abort on invalid pattern in matcher

hgweb: add strip and rstrip filters to handle summary

fix for cloning empty repo (.hg is still empty)

Remove deprecated commit -t option

zsh completion: Added '--newest-first' to incoming, outgoing

hgweb: a couple of fixes on search page - show search string in the bottom search box - wrap search boxes within paragraphs, this also puts some space between last changeset and bottom search box in firefox.

Fix relative pull in a subdir

allow 'hg out' / 'hg in' to show newest commit first

zsh completions: new -M, -m arguments for log, etc.

import docstring from doc/hg.1.txt

add --only-merges (-m) log

add --no-merges (-M) for log, outgoing, incoming

Fix use of diff(1) triggered by set -e. Search harder for a decent diff/patch to use.

hgweb: fix broken filelog->changelog link

hgweb: fix broken search->changelog link

Calling flush is unnecessary with bz2 decompressors and may not even exist.

hgk: add horizontal scrollbar to patch window

Add control-w key binding to quit hgk.

Change asciidoc backend to more recent name. The latest asciidoc doesn't have an 'html' backend. 'html' was last valid with version 6 ( 2005-1-28). Current options are xhtml11, or html4, with xhtml11 by default.

Fixed problem with invoking hgmerge on paths with spaces.

add a target for running only one test

hgweb: improve look-n-feel of changelog nagivation

[issue21] cannot debug extension The following patch should work.

Use $(MAKE) not make

py2exe is not able to handle win32com.shell Changes: - setup.py: help py2exe finding the shell module in win32com.shell

Option -i broken in py2exe_for_demandload Using the includes option -i on modified py2exe is not working. Change: - setup.py: convert self.includes to a list.

Avoid insertion/deletion of CRs on stdio during hg serve

hgweb: fix broken tags->changelog link

Make hgweb work when the repository is empty (no 00changelog.i)

hgweb: add a mercurial link to the footer

hgweb: hide trivial parent (like in show_changeset)

refactor some unlink/remove code and make sure we prune empty dir

New vim script; provides key mappings and menus for GVIM

Do not use 'glob' expansion by default on OS != 'nt'

hgweb: fix too short manifest link

hgweb: make viewing of non-text work in hgweb We use mimetypes.guess_type to guess file types and util.binary to determine whether a file is displayable as text. This lets us display displayable text files in our normal source view. Files that appear to be binary will be displayed as something like "(binary:image/gif)". Clicking on raw view will send the raw file with an appropriate MIME type. Thus things like GIFs will now be viewable inside hgweb without making a mess. Further, things like postscript files that are text should show source in the normal view and a browser can launch a postscript viewer for the raw view.

hgweb: shorten all the URLs in the standard templates A URL like this: http://www.selenic.com/hg/?cmd=changeset;node=5010207c35273ac1331cae44c253dd41fa07cb7f is now presented as: http://www.selenic.com/hg/?cs=5010207c352 (though the old style still works, of course)

hgweb: add shortcuts for all the web commands / fix empty arg bug

symlink unit test

allow empty values for url so we can have /?tip

hgweb: allow urls to be shorter by using shortcuts for example cs=xxx will be expanded to cmd=changeset;node=xxx

log: speedup keyword search when used with --branch By avoiding unnecessary branch lookup.

log: make keyword search truly case-insensitive

lazyindex fix, make load handle negative indexes properly.

i18n part2: use '_' for all strings who are part of the user interface

use a dummy function for gettext import gettext is really slow, until we figure out a solution we use identity for gettext

i18n first part: make '_' available for files who need it

Try to use ini-file in the same directory as the exe as the default on NT.

make update quieter when nothing is wrong sometimes when i am going around in my history, i get long lists of errors from the update command. this patch will fix that. i tried to make the code style the same like the rest of the code.

bdiff: change spurious __inline to inline

check if a file is ignored before complaining if it is an unsupported type

Add debugsetparents command

dirstate: make sure we read the dirstate before setting parents

Fix traceback on bad revlog.lookup

add a check for filetype when walking

Fix patch failure reporting exception

Borrow patch header detection heuristic from quilt

convert-repo: fix up octopus merge conversion

convert-repo: change duplicate elimination

convert-repo: linearize the tag commit

convert-repo: retrieve the commit hash from the tag object for tag import

convert-repo: Fix timezone handling

hg verify: add some bin to hex conversions

hg verify: add an error reporting helper function

hg verify: more consistency checking between changesets and manifests

log --debug: fix misplaced manifest field Index: hg/mercurial/commands.py =================================================================== --- hg.orig/mercurial/commands.py 2005-10-04 16:44:26.000000000 -0700 +++ hg/mercurial/commands.py 2005-10-04 17:16:42.000000000 -0700 @@ -1238,6 +1238,9 @@ def log(ui, repo, *pats, **opts): self.write(*args) def write(self, *args): self.hunk[self.rev].append(args) + def debug(self, *args): + if self.debugflag: + self.write(*args) def __getattr__(self, key): return getattr(self.ui, key) cwd = repo.getcwd()

Fix an hg copy/move bug. Failed if file being copied or moved not in tip.

Clean up mdiff imports

make diff dates be epoch for add/remove

Fixed a bug in my changes to httprepo.py

Fix same performance bug as c3654cfaa77 but for httprepo.py instead.

Fix traceback when nothing was added during unbundle The changegroup and commit hook are now run only when something is modified. The correct number of changesets added is printed.

Fix hg unbundle chunking performance bug

hg log: add -k for keyword searching

Merge with TAH

emacs minor mode optional argument With GNU Emacs 21.4.1 and desktop save/restore enabled, loading "mercurial.el" from ".emacs" breaks Emacs' initialization sequence when the desktop restore code loads a file under Mercurial control. The function 'desktop-create-buffer' passes an argument to each minor mode it activates for the buffer.

hgweb: remove various manifest and file hashes from display

Allows abbreviated hashes in hgweb

Fix completion function for 'hg pull'. Fix truncation bug and remove tabs.

bisect extension for mercurial it works almost the same as git-bisect: hg bisect init # start bisecting hg bisect bad # mark current revision as broken hg bisect good [<rev>] # mark <rev> as working ... the bisect code finds a new revision to try ... see if it works hg bisect good # if it worked hg bisect bad # it doesn't work continue until there is only one revision left

Fixed an exception that was caught and improperly forgotten.

Suppress warning in zsh_completion script

Fix data reported for the nullid changeset

Merge with self

zsh completion function for hg

contrib/hgk: remove hardcoded path to Wish

Re-add hgext/__init__.py

Set the user agent for httprepo communication

Partially revert ssh change so we read all of remote ssh stream

Replacing select.select() with os.fstat() which works also on windows.

Fix +x permissions lost by export/import

Test case for the misleading message on bad permissions.

Made the abort message for IOError nicer when the filename is known.

Fix misleading abort message when permissions are bad.

Make test-merge7 repeatable

Repair ancestor logic, fix up test cases

Fix pipe error regression

More info on file merge for update --debug

hgwebdir: Fix date display

Fix up static-http test

Execute hooks in the repository root

hgk: Allow specifying hgk path in [hgk]path

Fix hgk for date handling changes

Add support for /etc/mercurial/hgrc.d/*.rc

Warn on failure to import an extension

Fix copyright symbol in docs --- hg.orig/doc/hg.1.txt 2005-09-22 09:40:47.000000000 -0700 +++ hg/doc/hg.1.txt 2005-09-23 18:31:58.000000000 -0700 @@ -802,6 +802,6 @@ http://selenic.com/mailman/listinfo/merc COPYING ------- -Copyright (C) 2005 Matt Mackall. +Copyright \(C) 2005 Matt Mackall. Free use of this software is granted under the terms of the GNU General Public License (GPL). Index: hg/doc/hgmerge.1.txt =================================================================== --- hg.orig/doc/hgmerge.1.txt 2005-06-30 10:19:51.000000000 -0700 +++ hg/doc/hgmerge.1.txt 2005-09-23 18:31:59.000000000 -0700 @@ -30,6 +30,6 @@ hg(1) - the command line interface to Me COPYING ------- -Copyright (C) 2005 Matt Mackall. +Copyright \(C) 2005 Matt Mackall. Free use of this software is granted under the terms of the GNU General Public License (GPL).

hgk is a wish script --- mercurial-0.7.orig/contrib/hgk 2005-09-23 11:02:21.000000000 +0200 +++ mercurial-0.7/contrib/hgk 2005-09-23 11:07:57.000000000 +0200 @@ -1,6 +1,4 @@ -#!/bin/sh -# Tcl ignores the next line -*- tcl -*- \ -exec wish "$0" -- "${1+$@}" +#!/usr/bin/wish # Copyright (C) 2005 Paul Mackerras. All rights reserved. # This program is free software; it may be used, copied, modified

bash_completion is not an executable Index: hg/contrib/bash_completion =================================================================== --- hg.orig/contrib/bash_completion 2005-09-22 09:40:47.000000000 -0700 +++ hg/contrib/bash_completion 2005-09-23 18:32:46.000000000 -0700 @@ -1,5 +1,3 @@ -#!/bin/bash - shopt -s extglob _hg_commands()

Add empty repo test

Fix up some bugs for log and grep with empty repo

hgweb file: fixed left-justified line numbers on IE v6.0 IE (v6.0) seemed to squash the spaces surrounding the line numbers, making them appeared as left- instead of being right-justified. Testing with IE v6.0 and Firefox 1.0.6.

git -> hg conversion script contrib/convert-repo changes: - do not print verbose output so that error messages are seen more easily - Output the date as integer and not as floating point number. - Do not require a ".git" subdirectory to work on, but use the GIT_DIR environment var to specify the git repository. Change is otherwise compatible to the current version and I have tested it by converting the kernel and several git respositories from kernel.org. (Btw, the udev test dir contains a /sys dir with entries which should not be normal dirs and not be normal files. ;-) Thanks again for mercurial, Florian La Roche --- a/contrib/convert-repo +++ b/contrib/convert-repo @@ -28,26 +28,18 @@ self.path = path def getheads(self): - h = file(self.path + "/.git/HEAD").read()[:-1] - return [h] + return [file(self.path + "/HEAD").read()[:-1]] def catfile(self, rev, type): if rev == "0" * 40: raise IOError() - path = os.getcwd() - os.chdir(self.path) - fh = os.popen("git-cat-file %s %s 2>/dev/null" % (type, rev)) - os.chdir(path) + fh = os.popen("GIT_DIR=%s git-cat-file %s %s 2>/dev/null" % (self.path, type, rev)) return fh.read() def getfile(self, name, rev): return self.catfile(rev, "blob") def getchanges(self, version): - path = os.getcwd() - os.chdir(self.path) - fh = os.popen("git-diff-tree --root -m -r %s" % (version)) - os.chdir(path) - + fh = os.popen("GIT_DIR=%s git-diff-tree --root -m -r %s" % (self.path, version)) changes = [] for l in fh: if "\t" not in l: continue @@ -83,9 +75,9 @@ def gettags(self): tags = {} - for f in os.listdir(self.path + "/.git/refs/tags"): + for f in os.listdir(self.path + "/refs/tags"): try: - h = file(self.path + "/.git/refs/tags/" + f).read().strip() + h = file(self.path + "/refs/tags/" + f).read().strip() tags[f] = h except: pass @@ -99,8 +91,7 @@ def getheads(self): h = self.repo.changelog.heads() - h = [ hg.hex(x) for x in h ] - return h + return [ hg.hex(x) for x in h ] def putfile(self, f, e, data): self.repo.wfile(f, "w").write(data) @@ -155,12 +146,12 @@ newlines.sort() if newlines != oldlines: - print "updating tags" + #print "updating tags" f = self.repo.wfile(".hgtags", "w") f.write("".join(newlines)) f.close() if not oldlines: self.repo.add([".hgtags"]) - date = "%s 0" % time.mktime(time.gmtime()) + date = "%s 0" % int(time.mktime(time.gmtime())) self.repo.rawcommit([".hgtags"], "update tags", "convert-repo", date, self.repo.changelog.tip(), hg.nullid) @@ -262,7 +253,7 @@ num -= 1 if c in self.map: continue desc = self.commitcache[c][3].splitlines()[0] - print num, desc + #print num, desc self.copy(c) tags = self.source.gettags() @@ -275,6 +266,8 @@ self.dest.puttags(ctags) gitpath, hgpath, mapfile = sys.argv[1:] +if os.path.isdir(gitpath + "/.git"): + gitpath += "/.git" c = convert(convert_git(gitpath), convert_mercurial(hgpath), mapfile) c.convert() _______________________________________________ Mercurial mailing list Mercurial@selenic.com http://selenic.com/mailman/listinfo/mercurial

hgweb: fixed IE display problem on changelog page IE (v6.0) didn't seemed to comply to the 15% width on the left column of changelog display. Tested with IE v6.0 and Firefox 1.0.6.

hgweb: fix date bug in hgweb diff generation

Help debugability: print ssh command being used when --verbose.

Write hgrc file in text mode, even on Windows.

Give ssh a better chance of working on Windows. Switch the type of quotes used for the remote command. Open the pipe in binary mode.

Allow files to be opened in text mode, even on Windows.

Merge with myself.

Some repos represent a date as a float.

Merge with MPM.

Move urllib error handling from revlog into statichttprepo, where it belongs.

hgweb: pass date tuples around rather than whole changesets for dates

Fix old-http test when no server exists.

Make revlog constructor more discerning in its treatment of errors.

Clean up date and timezone handling. We used to pass changelog dates around as a "unixtime timezone" string containing a pair of encoded ints. Now, they get passed around as a (unixtime, timezone) tuple of numbers, which makes much more sense.

Fix up representation of dates in hgweb. Date display is now uniform both on the command line and via the web interface.

Fix behaviour of commit. It's now a fatal error if the option to --logfile isn't readable. Ditto if both --message and --logfile are specified.

Unify display of dates. We now use one function, commands.datestr, to display dates, instead of calling time.asctime in inconsistent ways.

Print commit time/date from perspective of committer. Previously, it was printed in the time zone of the reader, but with the committer's time zone offset. It is now consistent.

Hook fixups Pass the first new changeset node to the changegroup hook Call commit for each changeset in a pull changegroup Improve hook docs

Fix setting of hg default when using --pull on clone of local repository.

Fix default clone destination The default clone wasn't working: $ hg clone hg abort: repository hg/.hg not found! This was because we were creating the destination directory from the default, then checking whether it existed to determine whether to expand the path.

Fix traceback during invalid rev identifier for debugdata

Merge with TAH

bash_completion: extended patterns require extglob option

Updated CONTRIBUTORS.

Make debugwalk strip trailing spaces and remove these from test-walk.out

Cleanup of tabs and trailing spaces.

Merge with BOS

Add release notes to built Windows package.

Update Windows release notes.

Update hgrc documentation to refer to Windows paths.

Fix path of win32text extension in INI file.

Update Inno Setup installer to install INI file.

Fix small thinko.

Rename mercurial.ext to hgext.

Package the extension directory.

Add INI file for Windows.

Add win32text extension module.

Add placeholder extension module.

Make contract with extensions optional.

Clean up whitespace damage.

Enhance the file filtering capabilities. We now allow filtering through either pipes or pairs of temporary files. The latter appear to be mandatory for use on Windows.

Use platform-appropriate rc file names.

Document Windows installer build process.

Add Windows installer file. This uses Inno Setup. If you don't use ISTool to edit the file, you are either brave, nuts, or both.

Add post-install text file.

Turn the win32 README into a HTML file for now.

Add win32 README for standalone installer.

Make incoming/outgoing show oldest first

Make 'hg import' platform independent. - moved popen("patch ...") from commands.py to util.py - files may not be single quoted in popen under windows: fixed - patch returns the files quoted under windows. quotes need to be stripped off: fixed

Fix Volker's modifications to setup.py for non-Windows systems.

Support for the distutils extention 'py2exe' added. Description: - If the py2exe distutils extention is installed this patch allows building standalone exe for windows - example: > python setup.py build --compiler=mingw32 py2exe - The 'out of the box' py2exe is not able to resolve the dependencies due to 'demandload'. A new helper module of scanning the mercurial package has been added. Changed: - setup.py: importing py2exe and sub classing its command class to fetch the build directory and insert the needed includes - packagescan.py: new helper module added, that scans the distutil build directory for modules to be included.

Merge with BOS

Add --pull option to clone.

pull/unbundle: raise an exception on premature EOF

Add checks for programs which are required for the test suite to run. All prerequisite programs are checked for existance, and if any are missing, a list of missing programs is printed, and the test suite is aborted. All programs currently used in the tests, except those in core-utils, are checked.

hgit -> hgk.py Move hgit to hgk.py - importing hgit as an extension created compiled hgitc, which was confusing - hgit existed to support hgk so it was slightly misnamed - removed executable bit as we no longer run it directly - add 'view' command so we can run hg view - change git-* commands to debug-* so hg help won't show them - chdir to repository root on view so hgk doesn't choke in subdirs

Add a favicon.ico, small version of the main HG image.

Fix dirstate.changes for ignored directories. Do a second walking pass to examine any leftover files in the dirstate map that are in the .hgignore file but match our search criteria. This fixes the case of entire directories never being examined due to their presence in the .hgignore file, and should hopefully not add any significant overhead.

Fix cut and paste error in hgweb.py

Fix man page typos

Clean up RPM spec file

Update version number in PKG-INFO

Fix ignore regression. An empty or non-existent hgignore file must return False (don't ignore) for everything.

Switch to new syntax for .hgignore files. Here is the new syntax, in summary. Trailing white space is dropped. The escape character is "\". Comments start with #. Empty lines are skipped. Lines can be of the following formats: syntax: regexp # defaults following lines to non-rooted regexps syntax: glob # defaults following lines to non-rooted globs re:pattern # non-rooted regular expression glob:pattern # non-rooted glob pattern # pattern of the current default type The default pattern type is regexp, which is completely backwards compatible with the old hgignore syntax. In the dirstate class, the ignore method has been reworked to be based on the util.matcher function, by way of a new dirstate.hgignore method.

Merge with myself.

Fix performance of dirstate.changes with ignored directories.

Fix diff command so it doesn't walk the dirstate unnecessarily.

Added tag 0.7 for changeset 979c049974485125e1f9357f6bbe9c1b548a64c3

Update doc for ssh URL, describing path handling more clearly.

Generated new tcsh_completion with tcsh_completion_build.sh

Added new debug commands to bash_completion.

Add debugancestor command

test-hup: hgrc no longer created at init

hgweb: use ui:username rather than web:contact This also removes the creation of .hg/hgrc with web:contact at init time.

Merge with BOS

Add file encoding/decoding support

Clamp negative rev numbers at zero. Prior to this change, trying to run "hg log -r -50:" in a repo with less than 50 changes caused an error. Now that we clamp at zero: no more error.

mark copy/rename as experimental in the docs

Get all commands that operate on files to honour --verbose and --quiet. Fix minor bug in remove command; the when-to-unlink logic was wonky.

Switch cat command to use walk code. The old syntax of "hg cat FILE REV" is now obsolete. Use "hg cat -r REV FILE" instead, as for all other commands.

Add rename/mv command. This is the logical equivalent of copy and remove, and is in fact implemented as such. It doesn't use the remove command directly.

The copy tests don't need to invoke cp any longer.

Fix lots of exception-related problems. These have been around since the Big Code Split.

Merge with MPM.

Fix up copy command to behave more like regular "cp". In addition to recording changes, copy now updates the working directory.

Merge with myself.

Make remove command really unlink files.

mercurial.el: implement hg-pull, and stub in hg-update.

Files not getting added appropiately On Wed, 14 Sep 2005 15:15:13 -0400 Daniel Santa Cruz <byteshack@gmail.com> wrote: > c:> hg debugstate > a 666 0 09/14/05 15:11:44 a/aa\aa.a > a 666 0 09/14/05 15:11:47 a/aa\aa.b <---- notice mixed > slashes > > This all seems very confusing.... Please try this:

clone: fall back to pull if we can't lock the source repo

Fix hgit revtree bug with stop revision handling

Fix hg cat when the file cannot be found in the specified revision

Add support for cloning with hardlinks on windows. In order to use hardlinks, the win32file module is needed, and this is present in ActivePython. If it isn't present, or hardlinks are not supported on the underlying filesystem, a regular copy is used. When using hardlinks the biggest benefit is probably the saving in space, but cloning can be much quicker. For example cloning the Xen tree (non trivial) without an update goes from about 95s to 15s. Unix-like platforms should be unaffected, although should be more tolerant on filesystems that don't support hard links. (tweaked by mpm to deal with new copyfiles function) --- hg.orig/mercurial/commands.py 2005-09-13 19:32:53.000000000 -0500 +++ hg/mercurial/commands.py 2005-09-14 12:11:34.000000000 -0500 @@ -620,10 +620,6 @@ def clone(ui, source, dest=None, **opts) if other.dev() != -1: abspath = os.path.abspath(source) - copyfile = (os.stat(dest).st_dev == other.dev() - and getattr(os, 'link', None) or shutil.copy2) - if copyfile is not shutil.copy2: - ui.note("cloning by hardlink\n") # we use a lock here because if we race with commit, we can # end up with extra data in the cloned revlogs that's not @@ -638,7 +634,7 @@ def clone(ui, source, dest=None, **opts) for f in files.split(): src = os.path.join(source, ".hg", f) dst = os.path.join(dest, ".hg", f) - util.copyfiles(src, dst, copyfile) + util.copyfiles(src, dst) repo = hg.repository(ui, dest) Index: hg/mercurial/util.py =================================================================== --- hg.orig/mercurial/util.py 2005-09-08 00:15:25.000000000 -0500 +++ hg/mercurial/util.py 2005-09-14 12:16:49.000000000 -0500 @@ -12,7 +12,7 @@ platform-specific details from the core. import os, errno from demandload import * -demandload(globals(), "re cStringIO") +demandload(globals(), "re cStringIO shutil") def binary(s): """return true if a string is binary data using diff's heuristic""" @@ -217,17 +217,28 @@ def rename(src, dst): os.unlink(dst) os.rename(src, dst) -def copyfiles(src, dst, copyfile): - """Copy a directory tree, files are copied using 'copyfile'.""" +def copyfiles(src, dst, hardlink=None): + """Copy a directory tree using hardlinks if possible""" + + if hardlink is None: + hardlink = (os.stat(src).st_dev == + os.stat(os.path.dirname(dst)).st_dev) if os.path.isdir(src): os.mkdir(dst) for name in os.listdir(src): srcname = os.path.join(src, name) dstname = os.path.join(dst, name) - copyfiles(srcname, dstname, copyfile) + copyfiles(srcname, dstname, hardlink) else: - copyfile(src, dst) + if hardlink: + try: + os_link(src, dst) + except: + hardlink = False + shutil.copy2(src, dst) + else: + shutil.copy2(src, dst) def opener(base): """ @@ -244,13 +255,13 @@ def opener(base): if mode[0] != "r": try: - s = os.stat(f) + nlink = nlinks(f) except OSError: d = os.path.dirname(f) if not os.path.isdir(d): os.makedirs(d) else: - if s.st_nlink > 1: + if nlink > 1: file(f + ".tmp", "wb").write(file(f, "rb").read()) rename(f+".tmp", f) @@ -266,10 +277,41 @@ def _makelock_file(info, pathname): def _readlock_file(pathname): return file(pathname).read() +def nlinks(pathname): + """Return number of hardlinks for the given file.""" + return os.stat(pathname).st_nlink + +if hasattr(os, 'link'): + os_link = os.link +else: + def os_link(src, dst): + raise OSError(0, "Hardlinks not supported") + # Platform specific variants if os.name == 'nt': nulldev = 'NUL:' + try: # ActivePython can create hard links using win32file module + import win32file + + def os_link(src, dst): # NB will only succeed on NTFS + win32file.CreateHardLink(dst, src) + + def nlinks(pathname): + """Return number of hardlinks for the given file.""" + try: + fh = win32file.CreateFile(pathname, + win32file.GENERIC_READ, win32file.FILE_SHARE_READ, + None, win32file.OPEN_EXISTING, 0, None) + res = win32file.GetFileInformationByHandle(fh) + fh.Close() + return res[7] + except: + return os.stat(pathname).st_nlink + + except ImportError: + pass + def is_exec(f, last): return last

Convert hgk to use the hgit extension, and upate to the latest gitk

Turn hgit into an extension, and add commands supporting the latest gitk

Add log -b to show the branch a specific revision lives in This can be somewhat slow on very large repositories, so I didn't want to include it in -v --- hg.orig/mercurial/commands.py 2005-09-13 14:21:57.000000000 -0500 +++ hg/mercurial/commands.py 2005-09-13 18:55:52.000000000 -0500 @@ -1161,7 +1161,10 @@ def log(ui, repo, *pats, **opts): du = dui(ui) elif st == 'add': du.bump(rev) - show_changeset(du, repo, rev) + br = None + if opts['branch']: + br = repo.branchlookup([repo.changelog.node(rev)]) + show_changeset(du, repo, rev, brinfo=br) if opts['patch']: changenode = repo.changelog.node(rev) prev, other = repo.changelog.parents(changenode) @@ -1743,6 +1746,7 @@ table = { (log, [('I', 'include', [], 'include path in search'), ('X', 'exclude', [], 'exclude path from search'), + ('b', 'branch', None, 'show branches'), ('r', 'rev', [], 'revision'), ('p', 'patch', None, 'show patch')], 'hg log [-I] [-X] [-r REV]... [-p] [FILE]'),

Fix off by one in convert-repo tags --- crew.orig/contrib/convert-repo 2005-07-16 11:52:06.000000000 -0400 +++ crew/contrib/convert-repo 2005-09-02 02:58:14.000000000 -0400 @@ -86,9 +86,7 @@ class convert_git: for f in os.listdir(self.path + "/.git/refs/tags"): try: h = file(self.path + "/.git/refs/tags/" + f).read().strip() - p, a, d, m = self.getcommit(h) - if not p: p = [h] # git is ugly, don't blame me - tags[f] = p[0] + tags[f] = h except: pass return tags -- _______________________________________________ Mercurial mailing list Mercurial@selenic.com http://selenic.com/mailman/listinfo/mercurial

Fix bug with co -C across branches, update tests

Fix test-tag output for new abort message

Revert unrelated changes in previous commit

Fix abort message for clone

Revert some exception type changes in revlog

CONTRIBUTORS update

dirstate: two more stat -> lstat changes

Fix comment typo

Fix dangling symlink bug in dirstate walk code

Replace sequences of {ui.warn, return 1} with raise of util.Abort.

patchbomb: add TLS and SMTP AUTH support. Original patch from Lee Cantey <lcantey@gmail.com>.

Add --debugger global option With this option, hg will drop into the Python debugger on execution. Running 'continue' will execute normally, and the debugger will be reinvoked if an exception is raised.

Fix Windows status problem from new dirstate walk code

Update test-help for bundle/unbundle

Fix missing docstring for unbundle

clone: directory names take precedence over symbolic names If source matches both a directory name and a symbolic name to repo, the directory will be taken.

import: fix bug in mail-format detection

hgweb: fix scope for RepoError

Add preliminary support for the bundle and unbundle commands

Add missing import for hgwebdir

Cleanup of tabs and trailing spaces in documentation.

Add reporting instructions to unknown exception backtraces

Smarter handling of revlog key errors Use RevlogError for reporting exceptions Catch and report RevlogError exceptions at the command parser

Clean up hgweb imports Use demandloading Pull function-local imports up to demandload Scope hg and ui bits

Change grep -e to grep --all We want to reserve -e for future use and grep compatibility. I've changed every-match to all out of a general preference for shorter long option names where short options don't exist.

Fold import -m option into import -f

Revert silly TypeError change

Tighten up clone locking Add a lock on the destination, expand comment on source lock

Clean up local clone file list We now use an explicit list of files to copy during clone so that we don't copy anything we shouldn't.

Rewrite copytree as copyfiles This inverts the logic of copytree to allow copying single files at the top level.

Redo local clone hgrc fix We shouldn't copy hgrc on a local clone, nor localtags. Behavior should be identical to a remote clone.

Write out hgrc properly. Previously, we simply appended to the hgrc file, which meant that it ended up containing multiple "paths" sections. Now, we only modify "paths.default".

patchbomb: continue if we can't import readline.

Get test-commit to exit cleanly.

Commit date validation: more stringent checks, more useful error messages.

revlog: raise informative exception if file is missing.

Minor cleanups.

Created a class in util called chunkbuffer that buffers reads from an iterator over strings (aka chunks). Also added to util (for future use) is a generator function that iterates over a file n bytes at a time. Lastly, localrepo was changed to use this new chunkbuffer class when reading changegroups form the local repository.

Add test output.

Date validation must check for 32-bit width. Don't use assert to check.

Make date/timezone validation in changelog.add more robust. Add test.

Validate user input of dates when adding a changelog entry.

Add doc string for debugrename.

Fortify the recognition of a diff header.

Add -p to incoming and outgoing commands to show patch

Revert changeset 120aa5fc7ced1bf765b4f025f5a3a138cd87f49e. I inadvertantly used "hg import" on a message I saved, expecting it to do the right thing, but instead it made the commit look like I authored it, and filled the description with the email header. Changeset 737f9b90c571b3991f7e35dc846e7ef38a475cfe contains a guard against "hg import" doing this again.

Make import command reject patches that resemble email messages. See changeset 120aa5fc7ced1bf765b4f025f5a3a138cd87f49e for an example of why this is a good idea.

Make removal check more complete and informative.

Fix up remove command to use walk code.

From mercurial-bounces@selenic.com Thu Sep 1 07:01:32 2005 Return-Path: <mercurial-bounces@selenic.com> X-Original-To: bos@serpentine.com Delivered-To: bos@serpentine.com Received: from waste.org (waste.org [216.27.176.166]) by demesne.serpentine.com (Postfix) with ESMTP id 3616A20B571 for <bos@serpentine.com>; Thu, 1 Sep 2005 07:01:32 -0700 (PDT) Received: from waste.org (localhost [127.0.0.1]) by waste.org (8.13.4/8.13.4/Debian-3) with ESMTP id j81DxodQ028829; Thu, 1 Sep 2005 08:59:51 -0500 Received: from web32904.mail.mud.yahoo.com (web32904.mail.mud.yahoo.com [68.142.206.51]) by waste.org (8.13.4/8.13.4/Debian-3) with SMTP id j81DxnNA028824 for <mercurial@selenic.com>; Thu, 1 Sep 2005 08:59:49 -0500 Received: (qmail 25859 invoked by uid 60001); 1 Sep 2005 13:59:17 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=yahoo.com; h=Message-ID:Received:Date:From:Subject:To:In-Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding; b=O6sELrlCknW3M/gKVqijWs82e/CbDEum1sEitcuLKXaP9dHU175PszOqMgcSKykMY+BVXtcH3NeaXLM3FyBmqNkoPAvesezyFbgQsHSM1S028oOexybCKMvtGQJmz66hzd1fDb0QoPj1gCcGU2VDevQaOesSmo1xF9jJwy2LlLE= ; Message-ID: <20050901135917.25856.qmail@web32904.mail.mud.yahoo.com> Received: from [60.48.222.94] by web32904.mail.mud.yahoo.com via HTTP; Thu, 01 Sep 2005 06:59:17 PDT Date: Thu, 1 Sep 2005 06:59:17 -0700 (PDT) From: TK Soh <teekaysoh@yahoo.com> To: mercurial@selenic.com In-Reply-To: <20050828075808.GO27787@waste.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 X-Virus-Scanned: by amavisd-new Subject: Re: add -p to hg tip X-BeenThere: mercurial@selenic.com X-Mailman-Version: 2.1.5 Precedence: list List-Id: mercurial.selenic.com List-Unsubscribe: <http://selenic.com/mailman/listinfo/mercurial>, <mailto:mercurial-request@selenic.com?subject=unsubscribe> List-Archive: <http://www.selenic.com/pipermail/mercurial> List-Post: <mailto:mercurial@selenic.com> List-Help: <mailto:mercurial-request@selenic.com?subject=help> List-Subscribe: <http://selenic.com/mailman/listinfo/mercurial>, <mailto:mercurial-request@selenic.com?subject=subscribe> Sender: mercurial-bounces@selenic.com Errors-To: mercurial-bounces@selenic.com X-Spam-Checker-Version: SpamAssassin 3.0.4 (2005-06-05) on demesne.serpentine.com X-Spam-Level: X-Spam-Status: No, score=-1.6 required=5.0 tests=AWL,BAYES_00 autolearn=ham version=3.0.4 X-Evolution-Source: imap://bos@www.serpentine.com/ Content-Transfer-Encoding: 8bit

Merge with myself.

Output Content-encoding for tar.gz and tar.bz2 snapshots If the HTTP header 'Content-encoding' is missing for tar.gz snapshots, some gzip capable proxies can bork the tarball and serve unusable files to users. GZ tarballs are served using Content-encoding: gzip. BZ2 tarballs are served using Content-encoding: x-bzip2.

Fix up failing tests.

Optimize dirstate walking This generally cuts the time for hg status/diff in half, from 2s down to 1s. The main parts I'm trying to optimize are: 1) os.walk stats every file. dirstate.changes then stats every file again. 2) os.walk yields every file and subdir to dirstate.traverse who yields every file and everything in the dirstate map. dirstate.walk then filters this mass and yields every file to the caller. There should be fewer steps in here, and fewer duplicate strings yielded. 3) dirstate.walk runs util.unique on the results from dirstate.traverse, even though it is also passing things through dirstate.seen to look for duplicates. I've turned os.walk into something hg specific that takes all the dirstate ignore and matching rules into account. The new function also takes an function arg (statmatch()) the caller supplies to help filter out files it doesn't care about. dirstate.changes uses this to update state for each file, avoiding the second stat call. dirstate.walk is changed to turn the match function it is passed into a statmatch function. The only real difference is that a statmatch function takes the stat data as a second parameter. It now calls dirstate.walkhelper, who requires a statmatch function to be passed. This fails test-walk, but right now I think this is from a sorting error fixed by this patch. Index: crew/mercurial/dirstate.py ===================================================================

Merge with http://hannibal.lr-s.tudelft.nl/~vincent/fcgi/mercurial/fcgi/

Make sure the repository names don't have slashes at the at or else in some cases env[path_info] will not find an defined repository. REQUEST_URI can contain a query_string appending the repository name would lead to corrupt urls.

Saving sys.argv and sys.stderr is not needed anymore

Fix mercurial.el help.

Adjust hg-strip and hg-chomp regexps.

hg serve: print a more useful error message if server can't start.

Merge with TAH.

Emacs: fix invocations of "hg log" to match current behaviour of log.

Added missing 'import errno', and use errno for EPIPE, too.

Merged changes.

Use path relative to document root as reponame if published via a web server. The full path is still displayed when using 'hg serve'.

Sort items in each hgrc section. Add web/description.

Make .hg/hgrc optional for repositories published by hgwebdir.

Reverted changeset e254bcbfe636e97301f76c7da241b07be14f3d36 Volker Kleinfeld agreed that this is dead code and tried to fix a problem which was already fixed somewhere else.

Fixed two tests to run with bourne shell.

Added FIXME output to test-grep so the test will not fail.

Added test case for zip/gz/bz2 archive downloads.

Fixed import needed to serve zip files which broke because of other changes.

Merge with http://hannibal.lr-s.tudelft.nl/~vincent/fcgi/mercurial/fcgi/

Don't need to save sys.stdin and sys.stdout anymore

Use local generated env instead of os.environ

Fix hg serve...

Fix TypeError

Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object. Note: also change hgrequest.write(str(thing)) to hgrequest.write(thing), people should make sure they write strings.

Regenerate tcsh_completion after bugfix in generator script

tcsh_completion_build.sh: fixed error caused by xargs on Linux

Add tcsh_completion to contrib

Add contrib script for generating tcsh completion source

patchbomb: fix up confusion between strings and lists of strings.

bash_completion: try to use bash3 features if they're available This does NOT break completion for bash 2.05b (I haven't tested earlier versions)

bash_completion: small cleanup and bugfix _hg_count_non_option wasn't taking global options into account while counting non-option arguments. It also used only its first argument.

teach bash_completion about --cwd

bash_completion: better handling of aliases Instead of listing every alias in the big case..esac, use hg help to get the canonical name of the command.

bash_completion: update for new help output format

Add test-grep.out file for now.

Merge with TAH.

grep: extend functionality, add man page entry, add unit test. walkchangerevs now returns a two-tuple. Its behaviour is also extensively commented. The annotate command's getname function has been factored out to a new function, trimname, so it can be shared between annotate and grep. The behaviour of grep has been beefed up, so that it now performs a number of useful functions.

grep: change default to printing first matching rev. Printing of every matching rev remains via --every-match/-e switch.

Documented passing list or dict instead of config file in hgwebdir.cgi

Allow list of (virtual, real) or dictionary to be passed to hgwebdir.

Cleaned up hgweb.hgwebdir.run()

Use ConfigParser only in hgwebdir.__init__()

Don't create repo objects in hgwebdir, ui object is enough.

Reverted change 51f26e856f3d: Reading changelogs is too slow.

Use commit time instead of stat to check time of last change.

Remove the link from the template as there no real way to have it always be correct.

Make diffstat optional for patchbomb script.

Variable 'body' was missing in patchbomb script.

Adjusted test-hup for generated .hg/hgrc

Create [web] section with short username as contact on hg init and hg clone.

Completed renaming author to contact in hgwebdir: Prefer [web] contact = foo instead of author, but still accept the old name. Adjusted template to show obfuscated contact. Drop bogus <i>email</i> entry.

Create repository objects instead of using own ConfigParser in hgwebdir.

Longer variable names in hgwebdir: l->repos, v->name, r->path

Move generating short username to display in hg/hgweb annotate to ui module.

Fixed test-static-http with http_proxy variable set.

Fixed test-copy2 with only looking at copied files.

Changed printing of copies in hg debugstate to: "copy: source -> dest"

Add RSS link to the repository index. Index: hg/templates/index.tmpl ===================================================================

Add the template.

Use a template for the error message.

Use .has_option to avoid the unknown Exception.

NoOptionError is unknown there.

Handle a nonexistent repository with a 404 error. Based on changeset 62ea868cafbfa3acb7e5dba6982ecb46a1637246 from Vincent Wagelaar <vincent@ricardis.tudelft.nl> in http://hannibal.lr-s.tudelft.nl/~vincent/fcgi

Protect against unknown repositories.

patchbomb: eliminate silly complete summary message No longer makes sense without attachments

fix some rename/copy bugs - delete copy information when we update dirstate hg was keeping the copy state and marking things as copied on multiple commits - files that are renamed should have no parents if you do a rename/copy to an existing file, it should not be marked as descending from its previous revisions. - remove spurious print from filelog.renamed - add some more copy tests

Add some rename debugging support

bash_completion: add debugindex and debugdata support

Remove the lock file copied during clone (was the source lock file) Index: hg/mercurial/commands.py ===================================================================

Updated manpage and help. Updated manpage on change to hg status; standardized description of -print0 options.

hgweb: add mdiff / fix sorting of archives

Add an old-http test case This uses a trivial Python http server to test pulling from a static http server.

Add a simple dummy ssh test This uses the -e flag to run a dummy script rather than actual ssh to test the protocol over a local pipe.

Merge with TAH

Remove some options from 'hg grep': -Z (we have -0 as in locate) -a (use "-r 0:tip" instead, or always grep all unless -r is given) -e (we have the PATTERN argument) -v (doesn't work, and this is more of a job for 'hg cat|grep') -s (we have -q/--quiet) -f (should be always enabled if -l used, or enable on -v/--verbose)

Adjusted test-help for change to hg status.

Whitespace cleanup.

Replaced hg status -p/--strip with -n/--no-status to not confuse with patch.

Fix dirstate imports

Fix sshrepo imports

localrepo: minor opener usage restructuring

Separate out old-http support - create new statichttprepo class - pull remote bits out of localrepo - pull remote bits out of util.opener - switch hg.repository to use statichttprepo

localrepo: more import/namespace tidying

Minor import fixups

manifest: convert sys.stderr bits to AssertionError

localrepo: adjust some imports, remove sys dependency

sshrepo: adjust file comment

changelog: adjust imports, comment

Adjust some imports

commands: use revlog directly for debug commands This eliminates the import in hg.py

commands: use node functions directly

Move hash function back to revlog from node

Move opener to utils - move the opener code down to util - add docstring - change commands.py users to simply use file instead

Break apart hg.py - move the various parts of hg.py into their own files - create node.py to store node manipulation functions

updated manpage for new options of status

hgweb: add catch for connection reset suggested by Jeff Sipek

Fix up help test

status: added option -p and -0 to assist xargs The -p option strips the status prefix of each file, while -0 ends each file with a NUL character, instead of a newline. Together, selected group of files can be passed to 'xargs -0' for further processing.

updated manpage on global options and typo fix.

Add some docstrings to revlog.py

Update util.py docstrings, fix walk test

Change canonpath to not know about repo objects Code in util should not have any knowledge about repo objects

Updated list of contributors.

Document archive download options

Various cleanups for tarball support s/tarball/archive/ query config rather than maintaining a list default all archive support to off use changeset nodes rather than manifest nodes use web:name for archive name don't use rev number in filename, it's not portable refactor manifest lookup bits use finally: clause to delete tmpfile

tarball support v0.3 pt 2

tarball support v0.3 Hello, I'm slowly improving support for tarballs in Mercurial. Attached patch is made against current tip in Matt's repository - f859e9cba1b9, and contains everything done so far. Changes: - gzip and bzip2 tarballs are sent immediately without writing to temporary files (I was wrong Matt, it can be done very easy) - hgrc customization, you can choose which type (if any) you will support There's no easy way to support compression levels, since TarFile open() assume that it is 9. I tried to use gzopen(), and bz2open() methods instead, but it seems that headers of generated archives, are missing or wrong. We could eventually try to rewrite tarfile.py and include our own version into Mercurial, but I don't know if it's good idea... Wojtek

Fixed system command abord reason on windows.

Add revlog.reachable to find a graph of ancestors for a given rev

[PATCH] raise exceptions with Exception subclasses Fixed the patch. Using Exception subclasses. (tweaked by mpm)

Fixes for push corner case TAH found a bug where push would push things the remote already had, raising an assertion. This turned out to be because the changeset protocol was not recording a common subset node in one case. Also discovered was that the protocol was queueing multiple copies of a node for pull. Fixed by changing fetch to a hash. Add some more debugging output.

Add support for extension modules This adds support for an [extensions] section to hgrc. This has the form of: [extensions] mod=[path] If a path is specified, the python module found at that path is load. Otherwise, __import__ is used to find the module. Each module must implement a dict called cmdtable where the command line options for that module live. Each module must also implement a reposetup function: cmdtable = {} def reposetup(ui, repo): pass Index: hg/mercurial/ui.py ===================================================================

hgwebdir index: change "author" to "contact"

Allow using a ssh repository without a path. This uses the home directory on the remote side or the directory specified in the command in .ssh/authorized_keys

Fixed synopsis for grep command.

Fixed zero-padded filenames with %r if there is a longer number in the middle. e.g. with: hg export -o ../%r.patch 99 100 98

Shortened commands.revrange() a little bit, added docstring.

Cleanups to commands.py

Removed obsolete imports from hgwebdir.cgi

Some more spacing/indentation/linebreak cleanups to hgweb.py.

pep-0008 cleanup - Don't use spaces around the '=' sign when used to indicate a keyword argument or a default parameter value.

Fix set type usage for Python 2.3

Merge from BOS, fix help

grep: speed up matching, and only return one match per line.

Use ui.write instead of print in debugwalk.

Add grep command. It currently searches all revs of every matching file. I'll change this soon so that it can still do this, but it will not be the default behaviour. Many options are unimplemented. There's only one output mode. Binary files are not handled yet.

Map long option names containing dashes to ones containing underscores.

Minor test-help fix

Fixed some synopsises in command help.

Added missing doc strings for two new debug commmands.

Adjust display and alignment of command options to match global options.

Clean up displaying help of global options, only one row per option.

Moved --cwd handling to a place where ui and exception handling already exists.

Allow --help and --version being used together.

Added options -h/--help.

Moved special handling of --version and no hg command from parse to dispatch. This allows e.g. 'hg status --version' to work.

Sort global options by topic: directories, ui, timing, other (and changed indentation to match command table)