Process working files through encode filters in dodiff()

Use of opendiff as merge program on MacOS X Hello, If one has the developer tools installed on MacOS X there's another alternative for the merge program. Invocation could be done somehow like in the attached patch for hgmerge.

Clean up paths passed to hgweb (spotted by Peter van Dijk)

add removed files to the changelog file list - this should allow better detection of removed file when walking in the history (like hg log) it doesn't help for the fast path of hg log where we only look at the filelog - users of the changelog file list shouldn't assume anymore that the file still exist (anyway it won't be found in the manifest like in 5ecf05541e11) - fix the tests (some hashes changed)

Remove duplicate bunidiff code from hgdiff, importing from mdiff.py instead

bash_completion: ignore hg help error messages They are usually not useful when you're completing stuff and end up cluttering the screen.

bash_completion: always use single quotes with compgen -W This avoids a bug in bash 2.05a

bash_completion: be more careful about whitespaces - use awk to parse the output of hg help. - print one completion candidate per line - print the debug commands after regular commands (this eases the shell side of the parsing) - don't print aliases that are simple abbreviations (e.g. up/update, id/identify)

Added hint to hg-ssh that you can use shell pattern matching.

_hg_status improvements in bash_completion: - Use "hg status -n" option instead of cut command. - Sort status flags accoring to "hg status --help" - Show deleted files instead of "hg remove"d for "hg remove"

bash_completion: small updates and fixes - $result in _hg_commands is not an array - use "hg status ." - update "hg cat" completion - let bash itself generate the default completion

Add new bdiff based unidiff generation.

contrib: add Chris Mason's stand-alone diff tool This uses Mercurial's diff algorithm to generate unidiffs like the traditional diff tool.

Fix rcpath for hgwebdir case (sys.argv is empty)

copy & rename can ignore removed source files As mercurial now distinguishes deleted files from removed files, we can skip removed source files while copying or renaming.

copy/rename '.' or '..' correctly

Merge with Eric

Merge with crew

This fixes a bug that Chris Mason found. As for a test case, I can't think of one. It's a very weird case. Basically, if there is a file listed as changed in the changelog entry, but not showing up in any of the associated manifest entries, hg would abort when trying to create a changeset. Now it just decides the file must not have any versions relevant to the changeset.

Copy manifest map before modifying it (see issue86)

[hgweb] Prevent search engine bots from indexing the entire repository

fix for hgweb.filterfiles some variable weren't converted, fix a possible out of range error

make the order of the arguments for filterfiles consistent fix a bug where the order was reversed

correct the relative path when walking from a subdir - yield the correct relative path when walking from a subdir (regardless the walk is repo-wide or not) - have a consistent output from all commands: filename are absolute when no patterns are specified and relative otherwise.

Added test for relative paths and all status flags for 'hg status'

Added test for the currently broken addremove with the expected output.

fix locate broken since 63799b01985c - fix the keyword arguments for walk in commands.locate - implement 'hg locate -r <rev>' - add a test for 'hg locate'

Restored old behaviour for 'hg co' and 'hg co -C' for removed files.

Adjusted all but one test output for the new behaviour of localrepo.changes()

Distinguish removed and deleted files. Tests are not fixed yet. hg status will now show "R filename" for "hg rm"ed files and "! filename" for files which were deleted manually. Manually deleted files are considered unmodified.

Renamed c, a, d, u to modified, added, removed, unknown for users of changes()

Make localrepo.changes() internally distinguish between removed and deleted.

Cleaned up localrepo.changes()

Cleanup of indentation, spacing, newlines, strings and line length

hgk.py is not a script (no '#!' line needed)

Added archives links to gitweb template

Adjusted test output to match new hgignore error messages.

make invalid pattern message not confusing.

if hgignore contains errors, print message that is not confusing.

eliminate backtrace when piping output on windows. this fixes issue 54.

document revert command more accurately. this fixes issue 87.

add '_' to several strings

- duplicate the parent link logic to show child links - don't show trivial parent or children links

merge with mainline

add --plain option to patchbomb. this omits the hg patch headers. it makes a patchbomb email look like a regular email with a patch.

make patchbomb work with recent changes to export

strictly adher to 80 chars per line

Error handling for unbundle, fix option line wrapping

add --update support to 'hg unbundle'

remove the gpg stuff from hgeditor (superseded by the signing extension) remove the gpg stuff from hgeditor, update the comments to make it clear it can be used to show a diff while commiting

cleanup of revlog.group when repository is local revlog.group cached every chunk from the revlog, the behaviour was needed to minimize the roundtrip with old-http. We now cache the revlog data ~4MB at a time. The memory used server side when pulling goes down to 35Mo maximum whereas without the patch more than 160Mo was used when cloning the linux kernel repository. The time used by cloning is higher mainly because of the check in revlog.revision. before 110.25user 20.90system 2:52.00elapsed 76%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+708707minor)pagefaults 0swaps after 117.56user 18.86system 2:50.43elapsed 80%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+748366minor)pagefaults 0swaps

remove a duplicate check in commit / fix a bug when merging files followed by revert

fix 'hg tag <tagname> <revision> - fix a collision with the option keyword rev and the option name - update the tests

Re-enable the renamed check fastpath

Merge with crew

if a filename contains spaces, patch adds quote around it

gpg signing extension for hg the principle is almost the same as how tags work: .hgsigs stores signatures, localsigs stores local signatures the format of the signatures is: nodeid sigversion base64_detached_sig sigversion 0 signs simply the nodeid (maybe we would like to sign other things in the future). you can associate fingerprints with roles in hgrc like: [gpg] fingerprint_of_a_key_without_spaces = release fingerprint_of_a_key_without_spaces = contributor, testing the key used for signing can be specified on the command line or via hgrc (key =) thanks to Eric Hopper for testing and bugfixing

do not copy atime and mtime in util.copyfiles it is unsupported on some fs (vfat) and we don't need to copy it one clone anyway

reloads manifest and changelog after recovering

fix a bug in hg export --switch-parent

Better error message (without /.hg appended) when repository is not found. This makes the error for missing default or default-push more readable.

Less annoying directory completion (see http://bugs.debian.org/343458) The current bash completion script is quite painful in conjuntion with deep directory trees because it adds a space after each successful directory completion. Eg. "hg clone /ho<tab>" is completed to "hg clone /home " when what you really want is "hg clone /home/" (assuming the complete path to the repository looks like /home/foo/hg...). That's because the 'complete' command does not know about the type of completion it receives from the _hg shell function. When only a single completion is returned, it assumes completion is complete and tells readline to add a trailing space. This behaviour is usually wanted, but not in the case of directory completion. I've attached a patch that circumvents this problem by only returning successful completions for directories that contain a .hg subdirectory. If no repositories are found, no completions are returned either, and bash falls back to ordinary (filename) completion. I find this behaviour a lot less annoying than the current one. Alternative: Use option nospace for the 'complete' command and let _hg itself take care of adding a trailing space where appropriate. That's a far more intrusive change, though.

Merge with upstream.

delete unintended print statement

merge with crew

make mercurial look in more places for config files. now it searches <install dir>/etc/mercurial, /etc/mercurial, and user hgrc. this allows site-wide configuration to be shared over automounted nfs partition, instead of chenging on every system. option of having local configuration on every system remains. old code for searching /etc/mercurial/hgrc.d never worked, this code is tested and works.

fix the cat command - improve localrepo.walk when passed a node - make the differents walk commands in commands.py accept a node - change commands.cat to walk over a revision - add a test

abort when merging two heads and repository has local changes

Merge http://sh0n.net/jeffpc/repos/hg-gitweb/

Remove tabs, and trailing whitespace from hgweb.py

[hgweb] Remove reference to a non-existing file

[hgweb] Fixed up bad link

File log and some FIXMEs

[hgweb] gitweb style: File annotate converted, file revision made more like the deafault style Namespace polution prevention (manifest vs. tagmanifest - shouldn't be a problem yet) File annotate updated File revision now has commit info

[hgweb] More gitweb style related fixes Fixed manifest link on tags page Fixed changeset link on manifest page

File revision style fixed

[hgweb] Initial import of the "gitweb" style

add a --switch-parent option to export against the other parent

hg log -p should show file deletions

quote the filename when calling HGEDITOR

make all commands be repo-wide by default - refactor code in commands.py so that: if no pattern is given, the command will be repo-wide else it will work on the working dir - update the doc - fix the tests

make command defaults works for aliases

Handle hg under /

fix rename --after

Re: [PATCH 2 of 3] remove walk warning about nonexistent files On 11/15/05, Robin Farine <robin.farine@terminus.org> wrote: > # HG changeset patch > # User Robin Farine <robin.farine@terminus.org> > # Node ID ce0a3cc309a8d1e81278ec01a3c61fbb99c691f4 > # Parent feb77e0951e74d75c213e8471f107fdcc124c876 > remove walk warning about nonexistent files > > diff -r feb77e0951e7 -r ce0a3cc309a8 mercurial/dirstate.py > --- a/mercurial/dirstate.py Tue Nov 15 08:42:45 2005 +0100 > +++ b/mercurial/dirstate.py Tue Nov 15 08:59:50 2005 +0100 > @@ -336,9 +336,6 @@ > try: > st = os.lstat(f) > except OSError, inst: > - if ff not in dc: self.ui.warn('%s: %s\n' % ( > - util.pathto(self.getcwd(), ff), > - inst.strerror)) > continue > if stat.S_ISDIR(st.st_mode): > cmp1 = (lambda x, y: cmp(x[1], y[1])) this break some tests, a better fix would be to check if ff can be a directory prefix from files in dc you can try the attached patch. Benoit

export patkind() from util

Fix walkhelper on windows. The ''seen'' dictionary stores paths in canonical form, so the walkhelp must also provide paths in that form, otherwise the changed files are listed twice.

disallow '\n' and '\r' in tag names add a test for disallowed characters in tag names

Merge with http://hg.omnifarious.org/~hopper/mercurial

Convert all classes to new-style classes by deriving them from object.

fix run-tests' PYTHONPATH Specify the installation directory for python modules so we can set PYTHONPATH without guessing.

Updated help text for 'hg log'.

Space/Tab cleanup in bash_completion.

bash_completion: use hg --debug help to get the list of debug commands. Also, try completing with the debug commands only when there's no other candidates. Based on an idea by TK Soh.

Catch IOErrors and RepoErrors when serving repositories via hgweb.

Merge with mercurial/crew

Added version information to "report bug" message for unknown exceptions.

Fixes to "hg heads -r FOO": Make it actually work (undefined variable 'rev'; allow to pass a rev parameter). repo.branchlookup() doesn't need a copy of heads because it doesn't modify it. Use None as default argument to heads() instead of nullid. Doc string PEPification.

add a -r/--rev option to heads to show only heads descendant from rev

Always escape repository name in hgweb, very important in notfound.tmpl.

fix bug in setup.py introduced in r1508. The 'console' argument is expected to be a list of strings, but was changed to just a string.

close .hg/hgrc after writing the default values on clone this fix a bug where Dircleanup did not work because the file was still open

close file before renaming it (since it doesn't work the other way on windows)

fix errors found by pychecker

added st as alias for status in zsh_completition

Merge with Thomas Waldmann

made C src formatting more consistent

fixed some stuff pychecker shows, marked unclear/wrong stuff with XXX

minor optimization: save some string trash

use posix compliant option for head head -N is not posix compliant, head -n N should be used instead

Merge with upstream

Added hg-ssh - a wrapper for ssh access to a limited set of mercurial repos To be used in ~/.ssh/authorized_keys with the "command" option, see sshd(8): command="hg-ssh path/to/repo1 /path/to/repo2 ~/repo3 ~user/repo4" ssh-dss ... (probably together with these other useful options: no-port-forwarding,no-X11-forwarding,no-agent-forwarding) This allows pull/push over ssh to to the repositories given as arguments. If all your repositories are subdirectories of a common directory, you can allow shorter paths with: command="cd path/to/my/repositories && hg-ssh repo1 subdir/repo2"

Catch the exception raised with 'hg help <somethingambiguous>'. Example: 'hg help a'

Add revlog.strip to truncate away revisions. This updates the revlog data structures for index and nodemap in place so the .d and .i files don't need to be reread after stripping away a revision.

Optimize manifest.add Testing shows that manifest.add is spending a significant percentage of its time running calcoffsets and doing text = "".join(addlist). This patch removes the need for both of these by storying the manifest in a character array, and using a modified bisect search to find lines without the help of a separate index of line offsets. manifest.add was also reworked to push delta construction/combination into the main loop. Time to apply 2751 patches (without psyco, ext3 noatime,data=writeback): Stock hg: 4m45s real 3m32s user 55s sys patched: 2m48s real 1m53s user 43s sys quilt: 2m30s real 45s user 50s sys (quilt does much more io...)

Reduce string duplication in compression code This cuts down on string copies and allows buffers (instead of strings) to be passed into the compression code

reset mtime when two files are equal

add localrepo.wlock for protecting the dirstate - add localrepo.wlock - nest it in localrepo.lock - protect the code that change the dirstate

add a releasefn keyword to lock.lock releasefn is a function that will be executed when the lock is released

add dirstate.lazyread, write atomically the dirstate - add a dirstate.lazyread function that read only if it wasn't read before and update all callers - use the atomic keyword from util.opener to atomically write the dirstate mercurial/dirstate.py