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)

Fixed XHTML validation errors

Move aliases section in help below synopsis (issue362) This should avoid confusion why e.g. "hg help co" shows help for "hg update" instead.

test-convert-svn-source: test stop revision

Sort commands table again and add some missing 'hg' in synopsises.

Obfuscate (instead of just escape) contact/owner in gitweb summary. This could contain an email address.

Don't let ui.username override web.contact (issue900) 4603eef60237 introduced using ui.username before web.contact, but this was never documented and might cause commit accidents. - Drop web.author (deprecated since 2005) - Try ui.username or $EMAIL as a fallback to display something useful. - Update docs for the fallbacks.

realign commands table

bisect: improve tests - test skipping - test noupdate - test bad->good search - test inconsistent state

bisect: handle search for bad to good transitions Automatically detect whether we're looking for a bad to good transition rather than the usual good to bad transition by detecting when badrev is inside the good set and flipping good/bad.

bisect: make bisect a built-in command

bisect: faster merging

bisect: merge ancestor lists when pushing to children - eliminate some redundant tests and assignments - move ancestor list merging to child update

bisect: skip calculations on candidates with too many ancestors Once an ancestor list has grown past the perfect threshold, all descendants are less optimal. Use a poison dict to avoid pointless operations on their long ancestor lists, thus eliminating most of the work.

bisect: stop early if we find a perfect candidate

bisect: find best node in ancestor collection pass

bisect: calculate candidate set while finding children

bisect: use a dict for children We fill in the children only for ancestors of badrev

bisect: propagate ancestor lists directly to children - calculate the children of all candidates - for each candidate, combine ancestor lists - pass ancestor lists to children - store ancestor count This eliminates the O(n**2) memory usage, while maintaining about the same performance.

bisect: add noupdate option

Merge backout

Backed out changeset c2a21fe60994 Unfortunately, this breaks backward compatibility.

Show number of changesets written to bundle files by default (issue569) This was only shown with -v before.

"C" status code considered harmful, so changed to "=" (issue899) C means conflict in other SCMs, and = is more intuitive anyway.

Adjust changed test output after 0145f9afb0e7 (trailing whitespace)

Removed tabs and trailing whitespace in python files

util: filter all st_mode with 0777 in checkexec

merge with crew

Clarify some messages during commit: - use "branch 'foo'" to distinguish from "branch merge". - commit messags can be empty (to abort commits) - Added value for editor message: Tell about HG: lines like CVS does.

merge with crew

Merge with crew-stable

Prompt for a commit message in editor, improve error message

patchbomb: make --bundle respect --desc

patchbomb: read bundle file in binary mode

prompt: kill matchflags Python already lets one to embed RE flags directly in a regex, which is a much nicer way to do things: (?iLmsux) (One or more letters from the set "i", "L", "m", "s", "u", "x".) ... matchflags was introduced in 67afecb8d6cc, and the record extension is the only user. I've killed matchflag, and adjusted record code appropriately.

test-convert-cvs: force cvs -f options to avoid cvsrc There are some reference to a CVS_OPTIONS environment variable doing that but it does not work on my system (cvs 1.11.20, macosx).

Patchbomb: Prompt password when using SMTP/TLS and no password in .hgrc. If .hgrc specifies SMTP/TLS and a username without specifying a password, prompt for a password.

highlight: fix more tracebacks by forcing util._encoding to hgweb.encoding This is needed in case util._encoding and hgweb.encoding conflict. Extreme example: HGENCODING=UTF-8 [web] encoding = ascii Note: display of files whose encoding differs from HGENCODING or hgweb.encoding behaves not exactly the same way as with highlight turned off as replacement chars are either converted or replaced.

hg tag: run tag hook just once

patchbomb: break lines > 80 chars (coding style)

changelog: inline trivial call for extra data unescaping

changelog: remove extract function

util: simplify unique

remove unused util.localsub function

add debugfsinfo to check fs capabilities

atomictempfile: avoid chmod weirdness on Linux vfat

checkexec: fix VFAT tempfile droppings with more modern Linux kernels More recent Linux kernels don't pretend to allow any bogus chmods on VFAT.

bisect: use proper locking when updating bisect.state

bisect: remove class - rename core function to _bisect - rename command function to bisect - move state management to bisect

bisect: keep history of all bad revisions - use a single state dict - find the minimum bad revision

bisect: use more standard command syntax and help

bisect: move reporting out of core bisect function

bisect: add skip command - read/write skip lines in state - skip candidates in skipnodes - move bisect begin logic to next - add skip command

bisect: simplify state handling and init - use a single bisect.state file - unify init and reset (delete the state) - move write into good/bad

bisect: remove unused imports

bisect: rename autobad/good/next

bisect: slightly improve the help message

bisect: remove stale test function

bisect: use array.array rather than lists for ancestor lists This nearly doubles performance and cuts memory usage in half on large bisections.

bisect: switch individual ancestor lists from dict to list This saves quite a lot of memory and increases performance

bisect: turn ancestors into an array This makes things faster and eliminates the separate stop hash

bisect: greatly simplify the ancestor accumulating loop

bisect: switch to rev-based calculation - use revlog.parentrevs in search loops - calculate stop directly in O(N) without reachable - move badrev check into candidates

bisect: fix up node vs rev naming

bisect: clarify some bisection code - rename __ancestors... to candidates - remove head parameter (it's always badrev) - eliminate comprehensions to shrink parents - num_ancestors -> n_child name fix - clarify node selection

bisect: inline num_children function

bisect: remove usage of sets

bisect: remove stop argument to ancestors function

bisect: use bail_if_changed - switch to using existing bail_if_changed code - only abort when we're about to do an update

cmdutil: make bail_if_changed bail on uncommitted merge

bisect: remove versionstr

bisect: simplify lookup - use repo.lookup directly - move merge check to check_clean

bisect: remove redundant clean checks

bisect: fold in two trivial functions