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.