mergetools: correct vim typo

filemerge: handle missing regappend

util_win32: add missing valname param to query_val function

filemerge: two fixes for kdiff3 example configuration

add merge sections to hgrc.5

filemerge: remove the hgmerge script This is now better handled using [merge-tools] and [merge-patterns] in hgrc.

filemerge: add an example set of global settings for common merge tools

filemerge: add config item for GUI tools <tool>.gui indicates whether a tool requires a GUI to run

merge: add registry look up bits to tool search

merge: add support for tool EOL fixups specified with merge-tools:<tool>.fixeol=True

merge: allow smarter tool configuration Add [merge-tool] hgrc section with: <tool>.executable = name or path (<tool>) <tool>.args = args with $local/base/other/output ($local $base $other) <tool>.priority = priority (default 0) <tool>.binary = handles binary (False) <tool>.symlink = handles symlinks (False) <tool>.checkconflict = check for conflict markers (False) <tool>.premerge = try internal simplemerge (True if not binary or symlink) Four built-in tools: internal:{merge,local,other,fail} Add [merge-patterns] section of the form: <pattern> = <tool> Priority of settings is: HGMERGE merge-patterns ui:merge merge-tools by priority hgmerge, if it can be found Changes: unsuccessful merges leave .orig files

filemerge: pull file-merging code into its own module

merge: move the bulk of simplemerge into core - keep existing simplemerge command in contrib - clean up test interface

merge with crew-stable

test-serve: wait before killing to always hide the "killed!" message. Without the sleeps slower systems never display never display "killed!" while faster systems sometimes or nearly always display it.

Mention 'hg update' to switch branches in help for branch and branches.

Clarify help for hg status and make it consistent.

profile: expand PID in output file name

convert: allow synthetic history to be spliced in. Useful for recreating history in the face of SVN lossage.

profiling: allow CGI and FastCGI to be profiled

update copyright notice in version output

hgweb: explicit response status

updating lsprof.py from remote repository

highlight: update according to latest hgweb_mod changes Also move encoding workaround completely into non binary condition.

Fixed typo: Gnerating -> Generating

added \r for progress counting in churn extension

update the branch cache at the end of addchangegroup This should avoid a bad performance problem when the branch cache is not up-to-date, and hgweb can't write an updated version because it lacks permissions.

qpop/qrefresh: update self.applied before calling strip This will be important for the next patch, which may end up using this variable during an addchangegroup caused by strip.

hg import: write the dirstate after every commit This allows the transaction system to backup the correct file, so that a future rollback can do the right thing. This should fix issue963.

localrepo._tag: add a seek before writing the new tag Some systems require a seek (or flush) between read and write operations on the same file object. This should fix issue838.

convert: use 'unknown' and '0 0' if commit author or date weren't specified Closes issue873.

httprepo: use separate handlers for HTTP and HTTPS This is needed to keep the code in keepalive.py from sharing the same connection between HTTP and HTTPS. 52ce0d6bc375 explains why we were using a single handler. This should fix issue892.

move __del__ from httprepository to basehttphandler This should prevent the next patch from reopening an issue fixed by 0d94e4a3ddb4.

mq: don't allow patches with some reserved names The current list of reserved names includes only mq control files. Also, reserve names starting with ".hg" (to avoid troubles with e.g. .hgignore and .hgtags), and with ".mq" (to allow future extensions). This should fix issue841.

mq: pop/refresh: avoid losing revisions not managed by mq We already disallow committing on top of an mq revision exactly to avoid losing this new revision during a qpop/qrefresh, so this can be seen as an additional safety check. If this is not enough to fix issue844, it should at least prevent it from happening.

mqrepo: don't abort if the status file has an unknown node

sshrepo: be more careful while reading data This should avoid some tracebacks when the server sends some garbage.

fix markup of templates/{,old/}header.tmpl

templates: move filters to their own module This eliminates just about all Mercurial dependencies in templater.py

templater: move email function to util

templater: remove node import

patchbomb: undo backout and fix bugs in the earlier patch

added an entry about the prefix option inside the hgrc man page

tests for hg serve prefix option

hgweb: fixes to make hg serve prefix handling more robust

Merge with -stable

graphlog: skip filectx parents in other filelogs

Provide better context for custom Python encode/decode filters. While some can function with just some text and an optional command name, others may want a repository object, a ui object, and a file path. Use the enhanced information to good effect in win32text.dumbdecode's warning.

Register data filters in a localrepo instead of util - Changing data filters implementation is easier, adddatafilter() can rewrap filter after inspecting their prototype - Custom data filters really belongs to localrepo, mixing them with generic wrapper like "pipefilter" or "tempfilter" looks wrong. - util.filtertable should not be accessed from extensions

hgweb: forgot to centralize the req.write() calls in hgwebdir

hgweb: centralize req.write() calls

hgweb: explicitly check if requested command exists

hgweb: get rid of raw-related code in hgweb.filerevision()

keyword: detect restricted commands thru variable

webcommands: add missing hg import

Merge with crew-stable

convert: follow svn module parent moves

convert: prevent svn branches to leave the root module tree

convert: checkout svn root revisions Using changed files is enough if whole history is converted. Checkouts are required to restrict the conversion to user-supplied subtree.

convert: fix svn_source.latest()

convert: display source revision id with --verbose

Permitting the import command to accept a --user option. The prose section of the help text for the command already said that -u and -m are accepted, but -u was not listed in the table of options, and did not work. Useful when accepting patches from other people made by hg diff rather than hg export. For completeness, also accepting -d DATE. [CHANGES: rebased against d8878742a924, --no-commit option.]

Merge with crew

Simplify test-paths

merge with crew

Permit glob patterns to use nested curly braces.

Merge after backout

Backed out changeset dc6ed2736c81

keyword: improve use of dicts - actually use iteritems() when we iter over items of a dictionary - store commit hooks in dictionary (safe, as hook.hook() sorts before execution)

keyword: no expansion on qfold (bugfix)

Merge with crew

Ensure that absolutized paths from hgrc do not contain ../ segments.

glog shows at most one file: correct synopsis

Update usage message in test-glog.out AKA: Remind Thomas to run tests even after trivial changes.

Add back elipsis to [OPTION] that was stolen by 56e8a54bf71d

graphlog: add test for filelog graph

graphlog: add filelog revision grapher Graph a filelog's DAG, e.g.: hg glog mercurial/util.py

Test case for hg import --no-commit

Add --no-commit option to import command

win32: remove excessive flushing Our Windows file code was flushing buffers from the operating system to disk, rather than from the application to the operating system.

convert: hg.clonebranches must pull missing parents (issue941)

qrecord: add tests

qrecord: record complements commit, so qrecord should complement qnew Also there is an idea flying around to create something that will complement qrefresh: - maybe 'qammend'? or - 'qrefresh --interactive'? If we settle on '--interactive', then it would be conveniet to add this flag to 'commit' and 'qnew' as well.

Remove unneeded "import os.path"

send conservatively capitalized HTTP headers

demandimport: handling new relative imports Mercurial does not work on python2.6 because __import__ takes an additional argument called level. This patch merely calls the built-in __import__ when level is passed.

hgweb: move HTTP content types out of header templates This removes the ability for templates to add custom HTTP headers, which can easily be re-added if someone needs it. Thanks to asak for repeatedly reviewing this patch and helping to iron out the quirks.

hgweb: revert to showing file instead of offering for download

hgweb: be sure to send a valid content-type for raw files

hgweb: use ErrorResponse instead of custom response

better error reporting for hg serve errors in tests

hgweb: fix a stupid KeyError introduced in a0e20a5eba3c Thanks to Christian Ebert for finding this. Also added a test to prevent this from happening again.

hgweb: cleanup buglet introduced in 956afc025c0f

merge with crew-stable

CVS convert: Find correct parent for new branch (issue704) Previously the parent was determined by the last changeset where the branched file was changed even if the branch is based on an earlier revision. Fix written by mpm.

Test for converting a CVS branch

convert: mercurial sink must be local

Fix double import of 're'.

convert: Do not abort with TypeError if svn commit message is None (issue934)

Prefer i in d over d.has_key(i)

fix test-strip-cross on solaris Apparently "ENVVAR=value command" doesn't work when command is a shell function. Reported by Richard Lowe.

Merge with crew-stable

test-strip-cross: test handling of linkrev crosses in the manifest

Fix test-strip-cross on Solaris Solaris /sbin/sh doesn't do brace expansion

simplify revlog.strip interface and callers; add docstring Also, strip files only after the changelog and the manifest.

strip: calculate list of extra nodes to save and pass it to changegroupsubset When we remove revision N from the repository, all revisions >= N are affected: either it's a descendant from N and will also be removed, or it's not a descendant of N and will be renumbered. As a consequence, we have to (at least temporarily) remove all filelog and manifest revisions that have a linkrev >= N, readding some of them later. Unfortunately, it's possible to have a revlog with two revisions r1 and r2 such that r1 < r2, but linkrev(r1) > linkrev(r2). If we try to strip revision linkrev(r1) from the repository, we'll also lose revision r2 when we truncate this revlog. We already use changegroupsubset to create a temporary changegroup containing the revisions that have to be restored, but that function is unable to detect that we also wanted to save the r2 in the case above. So we manually calculate these extra nodes and pass it to changegroupsubset. This should fix issue764.

changegroupsubset: accept list of per-revlog nodes to include This will allow strip to include in the temporary changegroup some extra file/manifest revisions that should be restored after the truncations. This code doesn't allow specification of changelog nodes since I won't need that right now, the code wouldn't be tested and it's probably possible to do something similar enough by using the bases/heads arguments.

addchangegroup: add option to skip check for empty changelog group

allow the creation of bundles with empty changelog/manifest chunks

repair.py: don't use nested functions.

repair.py: use revs in limitheads

repair.py: add a docstring to bundle; use repo.ui

repair.py: split stripall into two functions; clean it up a bit

repair.py: rename chlog to cl

repair.py: nodes are nodes, revs are revs Use "striprev" instead of just "rev" to make the patch a bit less confusing. This is also a bit clearer than just "revnum".

repair.py: use node.* directly

repair.py: don't import commands.py

test-no-symlinks: fix unbundle output

Merge with crew-stable

Merge with crew-stable

keyword: add very simple mq test

Fix typo.

Fix test output

Merge with crew

hgweb: fast path for sending raw files

hgweb: just return iterables instead of yielding them

hgweb: separate out start_response() calling

hgweb: return iterable, add deprecation note

hgweb: remove some legacy code

keyword: avoid extra diffs when not comparing against working dir When diffing against specified revisions expanded keywords only get in the way. Update test output.

keyword: support mq; handle (q)record more gracefully mq: Ensure that expanded keywords do not make it into patches. - disable expansion when reading filelog - shrink expanded keywords when reading from working dir (wread) (q)record: Avoid additional hunks due to expanded keywords. However this is still a compromise, as keyword expansions are not updated in working directory because record should not overwrite files. Mention above shortcomings and "hg kwexpand" workaround in help and update test output. system argument parsing: Command detection might be slightly more expensive with dispatch._parse, but we will need this for improving "hg diff" output.

convert: enforce svn_source.getchanges() files unicity

localrepo: ensure files unicity in commit() (issue 714)

util: simplify unique

convert: fix invalid svn.ra.check_path() call (issue 771) The svn transport must be reparented to repository root before using check_path() with full entrypaths.

util_win32: make os_link more robust (issue 761) On mapped drives, os_link() manages to create links but nlink() does not report them.

transform a bunch of print statements to appropriate ui calls

Merge with crew

convert: document the subversion conversion model

convert: fetch less revisions when looking for a branch parent

Test subversion branches conversion

convert: make svn revision iterator interruptible

convert: fix cross-branches subversion revisions handling The "one revision belongs to one branch" assumptions is relaxed. Branch revisions are parsed down to the first branch copy encountered, older history is skipped. It means the conversion is still not satisfying when dealing with branches overwriting themselves. This issue already existed in the previous version.

convert: fix parents of last fetched svn revision

convert: don't scan directories on property changes

hooks: fix pre- and post- hooks specified in .hg/hgrc We were looking up hooks in the wrong ui object. Also, we weren't handling hooks to commands without a repo.

[PATCH] zsh_completion tag/mq fixes Been using these for almost a month now without problems, so I figured some other people might want them. This allows the zsh completion to work with tags and mq patch names containing spaces, and adds support for qgoto.

tests: Use /bin/sh for test-journal-exists, /bin/bash may not be available

patchbomb: prompt only once for SMTP password - simplify mail._sendmail to be a function rather than a class - simplify connect to return a function rather than a class - move exception handling from mail.sendmail to mail.connect - use a single connection for all messages in patchbomb

transactions: don't show a backtrace when journal exists Now we simply print a message on how to recover.

Merge with crew

diff: don't show function name by default We'd mistakenly made the -p option always on, which meant there was no way to turn it off. It also meant that we were sometimes splitting multibyte characters in function name, which isn't a good default.

merge with main

Merge with crew

convert should use default value when CVS_RSH is not set, that value being 'ssh'.

hgk: display branch name in diff header

Display debugstate dates as '%Y-%m-%d %H:%M:%S'

merge: add a bit more sanity to divergent copy checks

keyword: test that expansion is done filewise Checks issue fixed in 2a66138c5e7e.

Solaris compatibility fixes for test-keyword: - do not use /bin/false (yields 255 instead of 1) - do not use "cd -", simply use "cd .." instead.

convert: separate trunk detection from branch layout detection In some subversion repositories, trunk is present but no branches are used. The current code is assuming that both trunk and branches must exist before adding trunk's head to the heads list. It's just better to separate the branch layout stuff from the trunk one.

Merge with crew-stable

patch: handle empty vs no file in git patches (issue906)

patch: remove CRLF when parsing file names

Merge with crew-stable

Document --base null in bundle help

Merge with mpm

util_win32: implement posixfile_nt.writelines() Used by the keyword extension.

New extension to support problematic MBCS on Windows. The aim of this extension is to clear the problem related to having 0x5c in 2nd byte of encoded bytes. So this extension is usefull for: * Japanese Windows user shift_jis encoding. * Chinese Windows user using big5 encoding. To use this extension, simply enable it without any customization. Note that some important python built-in functions and mercurial functions are altered for this extension to convert argument if need to handle MBCS.

Fix not to use os.sep directly. This change is intended for MBCS support.

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)