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