patchbomb: 0c61124ad877 moved setremoteconfig into cmdutil

dispatch: restore a dropped shlex import Add test-dispatch as a place for command parsing and dispatch tests.

merge with main

Revive commands.dispatch as a simple way to call hg from other pythons scripts. This was already used by hg-ssh and others and is really convenient if you just want a native equivalent of calling the command line version.

extensions: fix lookup of hgext.foo modules

localrepo: demand-load changeset, manifest, and dirstate

extensions: add missing sys import

dispatch: accept an abbreviation of --repository

dispatch: move findrepo to cmdutil

localrepo: don't search from path All current callers already pass in the repo root. This normalizes things a bit. Now all repo types take a direct path to repo root and only the command line interface (or the dispatcher) searches from the current directory.

dispatch: use the repo path found by early parsing This lets us simplify things a bit.

dispatch: parse and apply -R early This allows us to use extensions specified in .hg/hgrc. Unfortunately, this requires us to parse that file twice, but performance impact on the version command appears to be less than 1%.

dispatch: parse and apply cwd opt early

dispatch: rename variables after code motion

dispatch: hoist debugging hook to runcatch

dispatch: move dispatching code to cmdutil

dispatch: move runcommand to cmdutil

dispatch: pull final command execution into its own function

dispatch: reduce nesting by moving parsing exceptions

dispatch: move signal and exception handling to its own function

Create a separate module for managing extensions

extensions: separate function for loading single extensions

dispatch: reorder functions

localrepo: break out the repo-finding walk into its own function

Respect locale environment variables on darwin. In python 2.4+ on darwin, locale.getpreferredencoding() returns mac-roman regardless of what LC_CTYPE, LANG etc are set to. This can produce hard-to-notice conversion errors if input text is not in mac-roman. So this patch overrides it with setlocale/getlocale if the environment has been customized, on the assumption that the user has done so deliberately.

Small cleanups for the new tag code

gitweb: Display branch and tag labels Pages which display labels: - summary - shortlog - changelog - changeset - search

Merge with mpm

Split convert extension into common and repository type modules

commit: fix bug where dirstate for removed file is confused This fixes issue586

hg serve: don't lookup user-supplied names/addresses

Removed trailing \n in calls to util.Abort()

Some small cleanups for convert extension: - repo doesn't need to be imported - util.Abort doesn't need \n - space after comma - long lines - spacing

Avoid extra filelogs entries. Right now, there are some situations in which localrepo.filecommit can create filelog entries even though they're not needed. For example: - permissions for a file have changed; - qrefresh can create a filelog entry identical to its parent (see the added test); - convert-repo creates extra filelog entries in every merge where the first parent has added files (for example, changeset ebebe9577a1a of the kernel repo added extra filelog entries to files in the arch/blackfin directory, even though the merge should only touch the drivers/ata directory). This makes "hg log file" in a converted repo less useful than it could be, since it may mention many merges that don't actually touch that specific file. They all come from the same basic problem: localrepo.commit (through filecommit) creates new filelog entries for all files passed to it (except for some cases during a merge). Patch and test case provided by Benoit. This should fix issue351.

Make sure the changelog mentions files whose flags changed These changes don't actually need a new filelog entry (see next patch), but if we don't mention the files in the changelog, it becomes much harder to find all changesets that touch a file (not even a "hg log --removed file" will work).

run-tests.py: set ui.slash = True This should make things easier for pysh.

test-config-case: print only the Section we're interested in. This allows us to add additional settings to the global hgrc file created by run-tests.py without breaking this test.

Add ui.slash hgrc setting This will make most commands print paths using "/", regardless of the value of os.sep.

docopy: use repo.pathto to format paths for printing

Add dirstate.pathto and localrepo.pathto. Every time util.pathto is called, we have to pass the repo root and the repo cwd. dirstate.pathto is a simple convenience function that knows about the root and the cwd arguments. It's still possible to pass the cwd as an optimization. localrepo.pathto is a convenience function that just calls dirstate.pathto, just like localrepo.getcwd. dirstate.pathto becomes a single point that converts most (all?) paths from the internal representation to some OS-specific relative path for display purposes.

Use absolute paths in revert.

Use absolute paths in docopy.

Use absolute paths in addremove. This is more consistent with other places in the code, which only use the "relpath" returned by cmdutil.walk for display purposes.

Add some more smart when initializing destination repository

Fix hgext/convert/__init__.py rights

Include convert extension in packages setup (reported by Christian Ebert and Eric Hopper)

convert: map CVS HEAD to default branch

ui: make readsections() abort when configuration cannot be read.

Removed trailing whitespace and tabs from python files

Fixed python2.3 incompatibility (rsplit) in cvs code of convert extension

Add a wrapper script for convert extension

Turns convert.py into a real extension

Move convert-repo to hgext/convert/__init__.py

Fixed test output for changed glog (. instead of @)

Issue a warning if "-r ." is used with two working directory parents. Rationale for not aborting instead: The first parent is usually more important as it is the local branch during a merge and commands like 'hg diff' and 'hg diff -r.' behave still identically (except for the warning of course). Added a test for log -r. with one and two parents.

graphlog: Print . instead of @ for working directory parents "." is accepted as an alias for the first working directory parent by -r/--rev

Remove atomicfile class. The interface provided by opener(atomic=True) is inherently unsafe: if an exception is raised in the code using the atomic file, the possibly incomplete file will be renamed to its final destination, defeating the whole purpose of atomic files. To get around this, we would either need some bad hacks involving sys.exc_info (to make sure things work in except: blocks), or an interface to say "file is complete; rename it". This is the exact interface provided by atomictempfile. Since there are no remaining users of the atomicfile class, just remove it.

Use atomictemp files to write the dirstate. atomic files are not safe in all cases.

test-serve: let run-tests.py kill the daemons If the daemons die while the tests are still running, we'll get additional "killed!" messages, making the test fail.

Fix bug in "hg serve -v"