Add util.splitpath() and use it instead of using os.sep directly. This change is intended to allow hooking splitpath() by win32mbcs extension for MBCS support.

Add endswithsep() and use it instead of using os.sep and os.altsep directly. This change is intended to allow hooking endswithsep() by win32mbcs extension for MBCS support.

Use util.normpath() instead of direct path string operation. This change is intended to allow hooking normpath() by win32mbcs extension for MBCS support.

svn: fix copy exception

posixfile_nt: set closed early Exceptions in __init__ may leave us with close undefined in __del__

Don't use the -i option with sed This patch fixes test-keyword on platforms without GNU sed (like OpenBSD).

convert: respect hg.tagsbranch setting

Issue #880: Simple misspelling ('occured') in web error message.

Tweak finddate to pass date directly. Previous implementation was passing (date + "to" + date), which fails when "<" and friends are prepended to the date specifier. Signed-off-by: Mark Williamson <mark.williamson@cl.cam.ac.uk>

adding "prefix" option to "hg serve" (command line and [web] section) allows "hg serve" to serve from a different path than '/' (server root)

Fix XHTML validation error on file diff page. Replaces <div>, a block level element, with <span>, it's inline counterpart, in <pre>, which is also an inline element.

hook: redirect stdout to stderr for ssh and http servers

convert: add commandline.xargs(), use it in svn_sink class Introduce commandline.xargs() to limit argument list with respect to ARG_MAX bytes. If no ARG_MAX information available - use POSIX required minimum of 4096 bytes. Under Windows, while actual argument list length is limited to 32k, shells impose their own limits on command line length, down to 2047 bytes for cmd.exe under Windows NT/2k and about 2500 bytes for older 4nt.exe. See http://support.microsoft.com/kb/830473 for details about cmd.exe limitations. Since ARG_MAX is limit for argument list and environment, we reserve half of it and one byte for environment variables. This way with default ARG_MAX (4096 bytes) we get value 2047 bytes which is OK for Windows too.

keyword: fix some doc strings; update copyright

hg qrecord -- like record, but for mq I'm a former Darcs user, and I've discovered that it is very convenient to actually perform development using MQ first, and only when the patches are 'ready' move them to project's history in stone. Usually I work on some topic, temporarily forgetting about any version control, and just do coding, experimenting, debugging, etc. After some time, I approach a moment, where my work should actually go to patches/commits, and here is the problem:: As it is now, there is no way to put part of the changes into one patch, and another part of the changes into second patch. This works, but only when changes are touching separate files, and for semantically different changes touching the same file(s) there is now pretty way to put them into separate patches. For some time, I've tolerated the pain to run vim patches/... and move hunks between files by hand, but I think this affects my productivity badly. So, here is the first step towards untiing the problem: Let's use 'hg qrecord' for mq, like we use 'hg record' for usual commits!

cmdutil.commit: extract 'addremove' from opts carefully we are going to use cmdutil.commit for qrecord, and it's brother qrefresh does not support addremove.

dispatch: allow extensions to provide setup code we'll need this soon, when record extension will optionally depend on mq early -- when preparing cmdtable. Also, if accepted, ExtensionHowto wiki should be updated as well.

record: refactor record into generic record driver rationale --------- I'd like to make MQ version of record -- qrecord. >From the first glance it seemed to be easy -- the task in essence would be to change call to cmdutil.commit() to something like mq.qrefresh(). As it turned out queue.refresh() and cmdutil.commit() have different semantics -- cmdutil.commit() first scans for changes and then delegate the actual commit to lowlevel func. On the other hand queue.refresh() do it all in once, and I am a bit scary to change it. Maybe the right way would be to first refactor queue.refresh() to use cmdutil.commit() machinery, and then trivially adjust record, but I feel I'm not competent for the task right now. Instead, I propose we refactor record to be some sort of high-level driver, or like a high-level decorator one can say, which will first interactively filter changes, and then delegate commit job to high-level commiter, e.g. 'commit' or 'qrefresh' So, this patch does just that -- refactor record to be generic driver, and update 'hg record' code to use the driver. 'hg qrecord' will follow.

record: some docs While studing record, I've written some docstrings and comments. Hope they are useful.

keyword: clean up quiet setting in kwdemo and adding of untracked kwfiles

keyword: suppress keyword expansion for log commands With previous bugfix "hg log -p" expanded keywords. Turn off again by making log, tip nokwcommands.

keyword: (bugfix) only set changenode for kwtemplater when committing kwexpand must always obtain changenode from filectx, otherwise current changenode is expanded in every file. Also fixes "hg cat <more than 1 file>".

test-mq-header: don't fail with different patch(1) At least under FreeBSD patch(1) won't fail on empty patch and will print 'Hmm...' warning instead. Sanitize output so tests won't fail unexpectedly.

Fix up tests for XHTML validation bits

Fixed numerous XHTML problems that caused validation errors and warnings. Link elements for Atom and RSS feeds had no end tag. <div> block element inside <a> in-line element isn't right and caused rendering problems on Safari. Spurious </div> tag in search forms. Branch entry missing closing </a> tag.

patchbomb: attachment options changed '-a/--attach' send patches as attachment '-i/--inline' sends patches as inline attachment (old behavior of -a/--attach)

patchbomb: consistently use opts.get

patchbomb: fix more line continuations (coding style)

keyword: add test

Add extension for filewise RCS-keyword expansion in working dir - keywords are only expanded working dir, not in change history - completely customizable keywords/expansions based on hg templates - intrusiveness/slowdown can be reduced by specifying precise [keyword] file patterns - can be turned off/on anytime - changesets can be exchanged regardless of remote/local keyword settings

restore branch after rollback (issue 902)

context: fix filectx.parents() bug introduced when editing 180a3eee4b75

merge with crew-stable

Fix copies reporting in log and convert. If copy logged in file revision, we report copy for changeset only if file revisions linkrev points back to the changeset in question or both changeset parents contain different file revisions. This fixes extra copies reported when executable bit was changed for previously copied file.

context: preserve changeset in filectx if we have one If we know original changeset we are working with - try hard to preserve it. Fallback to filelog.linkrev() only if we have no way to get original changeset, since linkrev() may point to other changeset.

test-convert-hg-svn: make it more windows friendly

test-convert-svn-sink: wrap repetitive svn checks in a function

Merge with crew-stable

convert: Fix bug of limit_arglist() loosing file on limit boundary.

test-convert: test before() and after() conversion actions

test-convert-svn-source: test convert/multiple extra fields

Merge with crew-stable

util: drop params added during experimentation

hg tag: run tag hook just once

Make run-tests.py --interactive work on Windows

convert: filemap must call base converter before()/after() actions

fetch: hide authentication details

serve: Don't change directory in the child if invoked with -d and --cwd

Fix status char in color extension for deleted (missing) files.

merge with main

convert: print commit log message with local encoding correctly.

convert: Accept local path on win32.

color extension: change from GPL3 to 2

changelog: fix decoding of extra (spotted by pmezard)

convert: svn_sink: workaround of command line size limitation on win32. On win32, the command line arguments seems to be limited about 2400 bytes. So 'add', 'delete', 'propget' and 'propdel' operations are called several times within this limitation. And also 'commit' operation is changed to be called without passing target files not to exceeds this limitation because it cannot be a separated like other operations above.

convert: svn_sink: specify encoding of message file explicitly on commit.

mq: add --currentdate and --date options to qnew and qrefresh These options make qnew add and qrefresh update a "# Date "-style header line. This allows proper recording of creation / last modification dates of patches in patch queues. Note that `qrefresh -D` only updates existing header lines. It never adds them, and does not warn about this. This is because I expect people to have `[default] qrefresh -D` in their .hgrc so patches with tracked dates get updated, others are left unchanged. The suggested setup in .hgrc is, in fact, [default] qnew = -D -U qrefresh = -D I tried to not mix header styles, so `qnew -D -U` now writes the user in "# User "-style, while `qnew -U` still writes it "From: "-style. Also, if `qrefresh -U` must add the user, it does so in "# User "-style if the header contains a "# HG changeset patch" line. (This is caused by mq not supporting the "Date: "-style header line at all - a reasonable choice given its standard date format.)

Add colored output to status and qseries commands

patchbomb: simplify some line continuations

patchbomb: add linebreaks after colons (coding style)