merge with crew-stable

Make test-hardlinks-safety portable On some systems cp cannot create/preserve hardlinks. Use util.copyfiles instead, after making sure it actually does create hardlinks.

merge with crew-stable

Adjust test output for hg help qrecord since ef14c773b3d6

merge with crew-stable

update copyright dates in Windows installer's readme file

mq: fix docs for qrefresh -D (issue1234)

hgweb: removed unnecessary del before function return Deleting tmpl just before the return statement should have no effect since tmpl goes out of scope anyway. But it confuses pyflakes who thinks tmpl is undefined when it is used in the except blocks below.

move % out of translatable strings The translators need to see the raw format string, not the result of using the format string.

Fixed docstring typos

Begin commit messages with two empty lines. This makes editors like Emacs wrap the commit message correctly. With no empty line between the commit message and the 'HG:' lines, the 'HG:' lines would be wrapped as if they belonged to the commit message and so lose their significance to Mercurial. This makes no difference to what is stored by the commit -- whitespace was already stripped from the beginning and end of commit messages.

Debashify rebase tests

Use relative imports in inotify.server. Fixes an import failure I was getting under hgtk and hgweb: *** failed to import extension inotify: 'module' object has no attribute 'inotify'

Do not sort hgwebdir repositories if python list or tuple is given. This was introduced by changeset f67d1468ac50 (util: add sort helper)

Fix up tests

Add rebase extension

coal/paper: make output well-formed and fix css syntax error breaking rendering

Merge with stable

clone: get a list of files to clone from store

store: drop self.encodefn

streamclone: fold in localrepo.storefiles

store: change handling of decoding errors

store: simplify walking - fold in main walking function - eliminate recursion (especially recursive yielding!) - eliminate default args

store: simplify class hierarchy

statichttp: use store class This lets us nix store.encodefn.

store: take opener as an argument

localrepo: simplify requirements checking

localrepo: kill _createmode

add test-verify

verify: check repo.store

revlog: add files method

store.py: accept empty repos Fixes a traceback on the server side when trying to streamclone an empty repo (this was *not* introduced by 80e51429cb9a).

verify: only warn on copy nullid

make commit fail when committing unresolved files

Update win32mbcs extension * Code cleanup by Matt. * Fix the issue with case-insensitive fs support by wrapping also util.fspath() and util.checkcase() * Abort program when path conversion is failed.

Merge with stable

convert: implement startrev for hg source

merge with crew-stable

Added signature for changeset d2375bbee6d4

Added tag 1.0.2 for changeset d2375bbee6d4

Folding correction and missing import

util: disinfect lookup_reg strings (issue1126) lookup_reg could return Unicode strings, which would infect other strings and generate unexpected tracebacks. Spotted by Rémy Roy. Fold in silly nested function while we're at it.

test symlinks on symlink-capable os but non-capable filesystem (issue1149) The "real" way to test this is to mount a non-symlink-capable filesystem, and try working on it; however, I don't know how to mount filesystems as a non-priveleged user from within the testing framework. So instead, os.symlink is overridden to raise the exception that would be raised on such a filesystem.

util: set_flags should survive failure to create link

util: set_flags shouldn't know about repo flag formats

Merge with stable Simplify the copy search algorithm

add a fix for issue 1175 If we copy a file followed by an update, it's possible for the parent manifest to no longer contain the source file of the copy, which could cause commit to fail. If this happens, we search backwares from the first parent to find the most likely original revision.

commit: simplify file copy logic

Make test-convert-mtn pass on systems where mtn add -R uses different order

Add ancestors and descendants to revlog This patch adds two methods to revlog: - ancestors: given a list of revisions returns their ancestors - descendants: given a list of revisions return their descendants

mdiff: compare content of binary files directly A plain Python string comparison stops when the first mismatch is found, whereas the call to md5 would need to compute the hash over the entire string and only then do the comparison.

merge with crew-stable

Make test-hardlinks-safety repeatable and executable

convert: Fix debugging output when running multiple commands with xargs.

keyword: add verify to nokwcommands after refactor in e79a8f36c2a5 Add test as well. Thanks to Guy Brand for spotting this.

merge with crew-stable

Let the notify extension use [diff] options too.

coal/paper: fixed box via an expression for IE < 7

Fix intermittent broken pipe in test-highlight

ui: add an option to prompt for the username when it isn't provided When ui.askusername is set and not username are specified on the command line, in hgrc or in the variables $HGUSER or $EMAIL, then hg will prompt for the username. Feature requested, and documentation provided by Mark Edgington.

Merge with crew-stable

add additional bisect tests

add additional complex bisect tests (with non-linear history)

Add support for multiple possible bisect results (issue1228, issue1182) The real reason for both issue is that bisect can not handle cases where there are multiple possibilities for the result. Example (from issue1228): rev 0 -> good rev 1 -> skipped rev 2 -> skipped rev 3 -> skipped rev 4 -> bad Note that this patch does not only fix the reported Assertion Error but also the problem of a non converging bisect: hg init for i in `seq 3`; do echo $i > $i; hg add $i; hg ci -m$i; done hg bisect -b 2 hg bisect -g 0 hg bisect -s From this state on, you can: a) mark as bad forever (non converging!) b) mark as good to get an inconsistent state c) skip for the Assertion Error Minor description and code edits by pmezard.

Merge with crew-stable

Add a reset before and after colorized output This is how GNU's ls --color works, and it clears up problems in xterm and Windows command prompt windows.

Apply color to output of qseries --verbose Fixes issue 1173.

color: improve mq extension detection

hgweb: do not use unassigned variables in exception handling

Merge with crew-stable

Fix subversion tests with svn 1.5

convert: normalize paths sent to svn get_log (issue 1219)

Merge with crew-stable

convert: remove leading slash from ra.check_path inputs (issue 1236)

convert: restore previous svn transport parent correctly

context: get rid of unused changectx.filectxs() method

context: fix workingctx's __contains__ method

merge: use correct branch name for counting heads

merge with crew-stable

add note about updating one file to update help

churn: fix documentation for churn options

introduce store classes move store walking from streamclone.py into store.py

move filename encoding functions from util.py to new store.py

Merge with crew-stable

convert: use git executable only, with subcommands The latest GIT has some changes in the way it is installed. Only the 'git' executable need to be in the path. All other commands are treated as sub commands of 'git'.

merge with -stable

make mq and tags hardlink safe The code didn't check for modes like "r+" or "rb+". Many thanks to agriffis for noticing it.

dirstate.walk: speed up calling match function

dirstate.walk: reduce sorting in step 3

dirstate.walk: inline imatch This lets us carefully avoid calling ignore and match where possible in the fast path.

dirstate.walk: more cleanups - group internal functions - simplify imatch - rename _join to join - use nf in step 3 - use .hg in results

dirstate.walk: fold in _supported - inline tests for regular or link files - simplify bad type reporting

dirstate.walk: build a dict rather than yield Since we're already building a seen dict, we might as well put our results in it to go slightly faster.

dirstate.walk: minor cleanups - add dirkind - simplify loop structure - avoid pconvert and join on directory entries (big speed bump) - remove redundant seen set in step 3

dirstate.walk: push sorting up

dirstate.walk: pull directory scanning into top-level loop

dirstate.walk: unify match.dir logic

dirstate.walk: simplify .hg scan bisect logic

dirstate.walk: track normalized directory names

dirstate: simplify normalize logic

dirstate.walk: change names for dc and known known -> seen dc -> dmap

dirstate.walk: fold findfiles into main walk loop

dirstate.walk: eliminate filter function - remove _filter and delete original - improve some filtering logic

dirstate.walk: eliminate src from yield - restructure 'step two' to stat unseen files - remove extra stat logic in status - remove redundant src

minor status fixups

Merge with crew-stable

test-branches: add a test for long branch name (issue 1230)

branches unparseable output fix (issue1230)

Bug:1201 hg convert on CVS working copy produces Traceback Fix identified by frank@kingswood-consulting.co.uk Changed usage fron os.environ["HOME"] to expanduser("~/.cvspass") as this is the only usage of this construct in mercurial sources.

Merge with main test-remove is still failing for status() does not return removed files in a sorted list. We can live with this for now, a fix is coming soon.

dirstate: remove superfluous normalize() call in walk()

localrepo: fix status() typos from 854b907527e5a and 97c12b1ed1e0

context: trigger missing username warning only when necessary

localrepo: do not modify a dictionary being iterated in status()

dirstate: fix _droppath() typo from 80605a8127e0

Add test for case folding issues

Sort removes first when applying updates (fixes issues 750 and 912) This change ensures that removes happen first in applyupdates(). This avoids issues where we try to make a case-only rename of a file on a case insensitive system. Without this patch, the add of the new name happens before the remove of the old one - which results in the file not existing, as the two names are effectively the same. With the patch, the old name gets removed then the new one gets added, which is always safe.

Added missing --config global option to zsh_completion. The global options --encoding and --encodingmode where also added. Without these options some functionality breaks. Also added basic completion for config items for the --config option.

Document password syntax in repositories URLs

Merge with crew-stable