run the doc/* through aspell.

Removed forgotten debug print statement from commands.py and tests.

Update tests

Fix a couple fencepost errors in hg log

Fix hg log -p

Show number of new heads when doing a pull

Add debugdata for dumping revlog revision data

Merge with MPM.

Fix a small corner of log behaviour. If invoked with no arguments in a subdirectory of the repo root, it should print the history of the repository as a whole.

Update hg log docs

Merge with BOS

Fix help output, and a few broken tests.

Merge with MPM.

Get patchbomb working with tip again.

Rewrite log command. New version is faster and more featureful. The original implementation of log walked backwards through history, which had terrible behaviour. It took several minutes to view complete kernel change history on a fast machine, for example. The rewrite uses a windowed approach to walk hunks of history forwards, while still giving results in reverse order. This reduces run time from five minutes to five seconds on my system. In addition, the rewrite uses our normal name handling mechanisms, so you can run a command like "hg log net/ipv4/**.c" and get a useful answer. It optimises for three different cases (no arguments, only files, and anything goes), so it performs well in all circumstances I've tested.

Merge with MPM.

Emacs: implement hg-incoming, hg-outgoing and hg-push.

Add commands.debugconfig. This lets us both view the actual config data that hg is using, and drive editors that need to see this information.

Emacs: fix up hg-log and hg-diff to operate more uniformly.

Merge with MPM.

Merge with MPM.

Sync buffers prior to doing a diff.

Minor tweak to the revgen algorithm

Minor hgwebdir tweaks - ignore / for PATH_INFO - fix // in URLs

Add Makefile to the manifest

Add default make rule The default make rule builds the extensions "in-place" so that hg can be run out of the working directory.

Create helper functions for I/O to files in the working directory This simplifies some code and gives us a single place to add I/O filters.

Add some aliases

Fix up help for binary options

Teach annotate about binary files

Add automatic binary file detection to diff and export Based on a patch by Fuming Wang - add util.binary which decides whether a file is binary if it has any NUL characters in the first 1K. - teach mdiff.unidiff to print "binary file <x> has changed" for binary files - add text flag to cause unidiff and dodiff to treat all files as text - add -a and --text flags (like diff(1)) to hg diff and export - update docs

Clean up argument passing for dodiff

Deal with repos with missing timezones

Merge with BOS

Emacs: search for hg in path before looking in funny places.

Merge with TAH

Don't show the diff in hgeditor if there are no changes in file contents.

Add Makefile for generating release tarballs. - test suite is run - documentation is generated and included

Include generated documentation in MANIFEST.

Generate html documentation by default, too.

Merge with BOS

Emacs: improved GNU Emacs support.

Emacs support: numerous changes. Most SCM commands now work in derived buffers (e.g. diff viewing buffers) as well as buffers backed by files. diff and log now work properly on repositories and files. Commit support is more solid. Doc strings are better.

Merge with MPM.

Emacs: update mode lines properly after commit.

Emacs: kill commit buffer once it's done with.

Emacs: first cut at commit support.

contrib/patchbomb: Fix buglet with empty cc list.

Fix handling of addresses in hgrc.

Emacs: document existing functions.

Emacs support: add hg-revert-buffer.

Fix callers to file.revision to use file.read This was causing unchanged files to show up as modified.

Clean up some merge logic - rename mode to branch_merge - use explicit update mode - use negative mtime for updates that set mtime - expand some cryptic variable names - elaborate merge dirstate comments - remove redundant manifest lookup for non-merge case - remove impossible merge case - fix up test cases

Fix up some bugs introduced by recent merge changes - use new changed list to track what files actually got new revlog entries at commit/rawcommit time - when updating a file during a merge, don't mark it as completely unchanged - handle file not being in parent 1 in status

merge: remove remaining mark bits

Fix long-standing excessive file merges Since switching to the multihead approach, we've been creating excessive file-level merges where files are marked as merged with their ancestors. This explicitly checks at commit time whether the two parent versions are linearly related, and if so, reduces the file check-in to a non-merge. Then the file is compared against the remaining parent, and, if equal, skips check-in of that file (as it's not changed). Since we're not checking in all files that were different between versions, we no longer need to mark so many files for merge. This removes most of the 'm' state marking as well. Finally, it is possible to do a tree-level merge with no file-level changes. This will happen if one user changes file A and another changes file B. Thus, if we have have two parents, we allow commit to proceed even if there are no file-level changes.

Reformat debugindex output

Remove unused relfilter function

hgweb: change startup argument processing - allow passing a repo object instead of a path (if we get a string, we construct a repo object) - hg serve: pass options via repo.ui.setconfig - add --style option - get default name from repo.root rather than getcwd() - remove template argument to hgweb() - reduce create_server from 8 args to 1

Add web:style option

hgweb: fix RSS and raw for new % scheme

Remove debug print

Fix RSS feeds

hgweb: convert index entries to list expansion style

Merge with jeffpc

Merge with MPM

hgweb: Changed manifest page to list format syntax

hgweb: Changed file revision page to list format syntax

hgweb: Changed annotate page to list format syntax

hgweb: Changed file page to list format syntax

hgweb: Changed changelog page to list format syntax

Added support for #foo%bar# syntax This required moving template() into the templater class

Deal with non-integer date offsets generated by some tools

Added tag 0.6c for changeset eac9c8efcd9bd8244e72fb6821f769f450457a32

Remove call to non-existent date_parser

Fix possible unitialized variable warnings

Minor README updates

[PATCH] Take DST into account Right now, mercurial doesn't take daylight saving time into account because it uses time.timezone inconditionally, instead of resorting to time.altzone if daylight saving time is on.

[PATCH] Print timezone offset when outputting dates Example: % hg log | head -12 changeset: 791:41440890e57d2dbacde03a2a114e5114a031ea4a tag: tip user: Samuel Tardieu <sam@rfc1149.net> date: Mon Jul 25 13:24:15 2005 +0200 summary: Parse various date formats when accepting user specified dates [...] changeset: 787:ba5c2021364ee876dae170e8f153e43bd0b2bd73 parent: 785:31a80e3723cee0a5991340facb2707e71983eb41 user: Bryan O'Sullivan <bos@serpentine.com> date: Sun Jul 24 00:39:24 2005 -0800 summary: Get "forget" command to use new walk code. [...]

hg import: abort with uncommitted changes, override with --force

Use post-expanded clone pathname as default

hgweb: Make maxfiles, maxchanges, and allowpull proper config options

Add -e and --remotecmd for clone and pull too

Doc updates for push, pull, hooks, local tags, and ssh options

Add --ssh and --remotecmd to push This uses the new setconfig options passing mechanism

Add ui.setconfig overlay This can simplify option passing

Fix option parsing bug for empty short options

Make mercurial.el load with GNU emacs

hgweb: sort repository list

Fix hgwebdir virtual start-up

Remove -C alias for --cwd

Add hgwebdir.cgi to MANIFEST.in

Merge with TAH

bash_completion: support GNU sed 3 and non-GNU sed replaced command 'Q' introduced in GNU sed 4, in order to support platforms with older sed.

Read global config file /etc/mercurial/hgrc and fix reading hgrc on Windows.

Removed TODO from MANIFEST.in

test fixes for Solaris 2.6 Solaris 2.6's stock sed doesn't support alternatives in regular expression. We workaround by breaking up the regexp.

Merge with BOS

In-progress Emacs snapshot.

Merge with MPM.

Merge with MPM.

Initial skeleton for mercurial.el.

Add --cwd global option, to change directory before doing anything. Useful for interacting with a program presenting a UI, such as Emacs.

Modify commands.walk to yield a 4-tuple. The new element of the tuple indicates whether a name is an exact match for one passed in on the command line.

Add a multi-repository server This merges a bunch of the ideas for a multi-repository CGI script and simplifies things a bit. It uses PATH_INFO so it generally wants paths of the form: http://host/hg.cgi/virtualpath This gets mapped via a simple config file to the real path. All info about the repo is read from the repo's hgrc.

Add in and out aliases

Fix stray debug statement

hgweb: add [web] section to hgrc This makes almost all of the hgweb settings available in hgrc.

Whitespace

Add a simple remove test

bash: Add smarter completion of add/commit/remove/forget/diff/revert Use hg status to determine which files are interesting for various commands. Thus, hg add [tab] finds unknown files, and hg commit [tab] finds added, modified, or removed files.

Fix path handling for deleting files on merge

Fixed --repository option when handling relative path When specifying relative path to --repository option, 'log' and 'diff' were unable to find the files specified. Here's the fix.

The TODO and the FAQ now live on the Wiki

Fix incoming for empty set

Fix incoming help test again

Add incoming to completions

hg incoming/outgoing: fix tests and update man page

Add hg incoming command for local repositories

Add a local() method to repository classes

run-tests: remove '+ hg' trick This was causing me a fair amount of debugging confusion. Let's just forget it entirely. Updated tests to match.

updated help text and added manpage section for hg paths Index: hg/doc/hg.1.txt ===================================================================

Add basic https support for pull

Teach bash_completion about outgoing

show_changeset: -q shows short hash

Add hg outgoing command

whitespace cleanup

hg cat: accept changeset hashes

Fix hg clone race with writer Most read operations in hg don't need locks because we order reads and writes for consistency. Clone is an exception to this as we're copying entire file histories and could end up with more file history copied than we have commits. For now, make clone take a lock on the source repo. Non-hardlinked clone should eventually be changed to use lockless pull.

Add bash_completion to contrib Contributed by "Alexis S. L. Carvalho" <alexis@cecm.usp.br> Attached is a file that implements bash completion for hg. Just reading it from your .bashrc should be enough to use it - I think: I'm using the /etc/bash_completion from debian and I'm not sure whether it sets some important option. It gets the list of commands, aliases and options from the output of hg help and then adds some specific stuff - e.g. completing update with tags; pull and push with path aliases and directories, etc.

Let hg paths work outside of repositories

Fix up help test

typo fix in command help text This patch fixes a few typo errors on the command help output (I am not sure if the change on 'diff' is the best though).

Minor tweak: os.STOPSIG -> os.WSTOPSIG. Pychecker spotted this one.

Fix .hgignore parsing if last line has no EOL, ignore trailing white space. (and don't use tabs in python code)

Merge with TAH

Addes test for error messages when operating on non-existing files.

Fix tests for new init command

Modify init command to take an optional directory to set up. If the directory does not exist, it is created. If no directory is given, the current directory is used.

Update synopsis for 'hg update', too.

Update online help of hg heads for new --branches option.

Add optional parameter for changed/added/del/unknown files to commands.dodiff This makes it possible to avoid a call into repo.changes if the details of what has changed is already known

Allow the changegroup generator to completely load the buffer. This makes is possible to delete or truncate away revisions and still use the changegroup later.

Add optional stop revision to revlog.heads

Change repo.comit to return None on error or the new revision number on success This allows the caller to correctly record the new revision number

Add force option to repo.commit, allowing commits where no files change

Add '-' support to the commit logfile option to read message from stdin.

Add searching for named branches named branching is when you identify a head by a tag on an earlier revision. This patch adds repo.branchlookup for searching through the tree to find branch tags for heads. hg update -b tag is added to checkout based on branch tags hg heads -b is added to print the tag associated with each head

Fix bug with empty inc and exc This fixes an exception that showed up when importing patches

Merge with BOS

Merge walk changes with Matt's tip.

Merge with TAH.

Turn off testing of absolute paths for now. I don't know how to stop this from always reporting false errors, and am too lazy to worry about it right now.

Fix bug involving "hg debugwalk -Ipattern" from repository root.

Fix clone when target directory is relative.

Merge walk fixes.

Add unit tests for walk code.

Fix up handling of regexp paths.

Merge Windows path fixes.

Fix walk path handling on Windows

Merge latest round of walk fixes.

Fix walk code for files that do not exist anywhere, and unhandled types. Prior to this, a file that did not exist was reported as showing up in the filesystem, as were files of unsupported types (such as fifos). Now, an error message is printed and nothing is returned in such cases. This change also moves the commands.pathto function to the util module, as the walk code needs it to print non-confusing error messages.

Update to tip.

Merge IPv6 fix.

Fix problem with "hg serve" on systems not providing IPv6.

addremove was not correctly finding removed files when given a list of files to look at. These end up with a src of 'f' from walk() but no longer exist on the filesystem. Index: mine/mercurial/commands.py ===================================================================

dirstate walking optimizations The repo walking code introduces a number of calls to dirstate.map.copy(), significantly slowing down the walk on large trees. When a list of files is passed to the walking code, we should only look at map entries relevant to the file list passed in. dirstate.filterfiles() is added to return a subset of the dirstate map. The subset includes in files passed in, and if one of the files requested is actually a directory, it includes any files inside that directory tree. This brings the time for hg diff Makefile down from 1.7s to .3s on a linux kernel repo. Also, the diff command was unconditionally calling makewalk, leading to an extra pass through repo.changes. This patch avoids the call to makewalk when commands.diff isn't given a list of patterns, cutting the time for hg diff (with no args) in half. Index: mine/mercurial/hg.py ===================================================================

Merge patchbomb script.

Polish patchbomb script. diffstat output is now a non-default option. The hgrc file can now contain default information for the patchbomb script. Date generation is fixed.

Get patchbomb script to not use MIME attachments. Adding patches as attachments makes it difficult or impossible for some mail clients to quote them effectively.

Add patchbomb script.

Merge Chris's changes with mine.

addremove was not correctly finding removed files when given a list of files to look at. These end up with a src of 'f' from walk() but no longer exist on the filesystem. Index: mine/mercurial/commands.py ===================================================================

dirstate walking optimizations The repo walking code introduces a number of calls to dirstate.map.copy(), significantly slowing down the walk on large trees. When a list of files is passed to the walking code, we should only look at map entries relevant to the file list passed in. dirstate.filterfiles() is added to return a subset of the dirstate map. The subset includes in files passed in, and if one of the files requested is actually a directory, it includes any files inside that directory tree. This brings the time for hg diff Makefile down from 1.7s to .3s on a linux kernel repo. Also, the diff command was unconditionally calling makewalk, leading to an extra pass through repo.changes. This patch avoids the call to makewalk when commands.diff isn't given a list of patterns, cutting the time for hg diff (with no args) in half. Index: mine/mercurial/hg.py ===================================================================

Merge with mpm.

Teach walk code about absolute paths. The first consequence of this is that absolute and relative paths now all work in the same way. The second is that paths that lie outside the repository now cause an error to be reported, instead of something arbitrary and expensive being done. Internally, all of the serious work is in the util package. The new canonpath function takes an arbitrary path and either returns a canonical path or raises an error. Because it needs to know where the repository root is, it must be fed a repository or dirstate object, which has given commands.matchpats and friends a new parameter to pass along. The util.matcher function uses this to canonicalise globs and relative path names. Meanwhile, I've moved the Abort exception from commands to util, and killed off the redundant util.CommandError exception.

Kill dead function.

Fix debugwalk when there's nothing to walk.

Allow Mercurial to build on HP-UX 11 Temporary fix to allow Mercurial to build on HP-UX 11, as the C compiler on HP-UX 11 doesn't support 'inline' qualifier. The '__inline' qualifier seemed to be supported, but not without first resolving other associated issues.

Merge with TAH

Cleanup after previous changes: - there are only two states for the exec bit, so no need to override it. - file_ variable is only once now, so it self.file(f) can be used directly.

Extended test case to test dirstate length bug fixed in a7e95e3606c7.

Use length of file instead of length of change for the dirstate entry.

Fix 3-way-merge of original parent, workdir and new parent. The dirstate has to match what is in the repository (what would be checked out with 'hg update -C'), because the resulting file may be identical to the new parent, or it may be completely different. Previously the dirstate wasn't updated, so if you changed the file to look like the original parent, it might be considered unmodified relative to the new parent.

dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Interface is not yet changed. Non-regular files are considered to be removed or deleted. Removed the unneeded match(fn) call for adding to the unknown list.

Use correct term "closed interval" for ranges.

Trap OSError when deleting env vars On the other OS, it seems that case insensitivity for environment vars can bite users when using some unknown combination of python 2.4.1 and win2kSP4+minsys (and probably other vversions of these softwares). The best way to avoid problems in those weird cases is to ignore OSError exception during env var deletion.

[PATCH] Move default page name into map file Move default page name from code into the map file. This way, different hgweb styles/themes are free to select their default (no cmd in args) page.

[PATCH] Propagate the template map though recursively This patch allows propagates the template map though recursively though all the templates. This allows for some hgweb template cleanup patches as well as it makes writing new skins/themes for hgweb much much easier. (I'm planing to write several basic ones.)

Fixed encoding of directories ending in .d or .i: One .d and .i was mixed up, and string replace method doesn't work in-place.

Added Tristan Wibberley to contributors.

Fixed revlog.children. It was comparing a node to a rev, then appending a rev onto the list of children being constructed instead of a node.

Update TODO

Allow HG patch to appear late in the input stream

Added Samuel Tardieu to contributors list.

Add temporary documentation files and profiling output to .hgignore

Further help improvements: Show command aliases in 'hg help something', unless in quiet mode. Show short command description with 'hg help -q something'. Show global options in verbose mode of command help. State that Mercurial is a Distributed SCM.

Always show short help when an unknown command is given.

Update the TODO file to the help changes, and the output of test-help.

When hg is invoked without parameters, the short list help is displayed. When hg is executed without parameters ( or hg is executed with the 'help shortlist' command ) the short help list is displayed. If the 'help' command is passed on the commandline the full help list is displayed. In both the cases if the switch '-v' is passed, the help contains also the aliases of the short/full commands list and the global switches.

More verbose information on the global options

'hg help -v' mentions the alias of the commands

'hg help -v' shows global options

Rewritten change type selection for hg status.

Realigned command table again.

hg status: added options to select files by status. Added options -m, -a, -r and u to select files corresponding to status M, A, R and ? respectively. If none of these options are specified, files of all status will be shown.

Merge with BOS

Merge with Matt.

Fix performance of hg diff. commands.walk has been refactored. commands.walk's behaviour remains as it was, but there is a new function, commands.makewalk. This returns results that can be passed along to other internal code, in our case dodiff.

Merge with TAH

Cleaned up trap handling in run-tests, too.

Use sh instead of bash in tests.

Removed special FIXME handling in run-tests, added bug info to .out files.

Handle broken pipe on pressing Ctrl-C with e.g. 'hg log|grep something'.

Cleaned up trap handling: - Use numbers instead of signal names - No need to explicitly call "cleanup_exit RC" to exit with return code RC.

If rejects are empty after using the editor, merge with diff+patch was ok.

Shortened hgmerge a little bit.

Hide error message of type command.

Fix array overflow bug in bdiff I ran into a bug while importing a large repository into mercurial. The diff algorithm does not allocate a big enough array of hunks for some test cases. This results in memory corruption, and possibly, as in my case, a seg fault. You should be able to reproduce this problem with any case of more than a few lines that follows this pattern: a b = = 1 1 2 2 3 4 3 5 . 4 . . 5 . . . I.e., "a" has blank lines on every other line that have been removed in "b". In this case, the number of matching hunks is equal to the number of lines in "b". This is more than ((an + bn)/4 + 2). I'm not sure what motivates this formula, but when I changed it to the smaller of an or bn (+ 1), it works. [comment added by mpm]

Allow import from files with spaces Index: hg/mercurial/commands.py ===================================================================

Add an option to hg serve to serve file using IPv6

Merge with BOS

Use list comprehension in hg status.

Attempt to yield names in sorted order when walking. This is an improvement in behaviour, but the walk and changes code still has some flaws that make sorted name presentation difficult: - changes returns tuples of names, instead of a sorted list of (name, status) pairs. - walk yields deleted names after all others.

Ensure that dirstate.walk only yields names once. Its predecessor code used to do this, and now it does, too.

Clean up walk and changes code to use normalised names properly. New function: commands.pathto returns the relative path from one path to another. For example, given foo/bar and baz/quux, it will return ../../baz/quux. This new function is used by the walk and status code to print relative paths correctly. New command: debugwalk exercises the walk code without doing anything more. hg.dirstate.walk now yields normalised names. For example, if you're in the baz directory and you ask it to walk ../foo/bar/.., it will yield names starting with foo/. As a result of this change, all of the other walk and changes methods in this module also return normalised names. The util.matcher function now normalises globs and path names, so that it will match normalised names properly. Finally, util.matcher uses the non-glob prefix of a glob to tell walk which directories to scan. Perviously, a glob like foo/* would scan everything, but only return matches for foo/*. Now, foo/* only scans under foo (using the globprefix function), which is much faster.

Update output for test-merge5.

Actually implement the -f switch for push

Make ssh URL parsing more robust

Warn on pushing unsynced repo or adding new heads By popular demand

Psyco was failing to call dirstate.__del__ for import Remove it.

Merge with BOS

Adapt commit to use file matching code. The code is slightly complicated by the need to commit all outstanding changes in the repository if no file names are given (other commands operate on the current directory and its subdirectories in this case). localrepository.changes has acquired an optional match parameter, to let it filter out include/exclude options.

Reduce the amount of stat traffic generated by a walk. When we switched to the new walk code for commands, we no longer passed a list of specific files to the repo or dirstate walk or changes methods. This meant that we always walked and attempted to match everything, which was not efficient. Now, if we are given any patterns to match, or nothing at all, we still walk everything. But if we are given only file names that contain no glob characters, we only walk those.

Fix documentation of -I and -X options. These options apply to all names, not just to directories. In other words, you can do something like this: hg add -X 'f*' '*.c' and it will have the effect of "add all files matching *.c, except those starting with f".

Move commands.forget over to using new walk code. With no names, it now recursively forgets everything, as is the default behaviour of other commands. And prints the names of all files it hasn't specifically been told to forget.

Fix performance regression in addremove command. When I rewrote addremove, I lazily put a call to repo.changes in, which was unnecessary and slow. This is a new rewrite, preserving the file name behaviour, but replacing the call to repo.changes with a walk, which is much cheaper, and avoids calls to os.stat on all but files that have probably been deleted.

Merge with TAH

Include tests (or possibly maps) ending in numbers in MANIFEST, too.

Add Makefile from doc directory instead of / to MANIFEST.

Drop .err files generated by failed tests from the MANIFEST.

Incorporated most of Aron Griffis suggestions for sh compatibility.

Use tabs instead of spaces where apropriate.

Allow tests for not yet fixed bugs to fail without generating error diff.

Updated output of tests.

Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.

Adapted README to new needs.

Make tests work on Solaris: - replacement for mktemp - fall back if shell arithmetic doesn't work - replacement for 'set -x' (which results look different with some shells) - "FOO=bar; export FOO" instead of "export FOO=bar" - don't use 'if ! ...'

Remove "export FOO=bar" bashism.

Replaced mktemp and usage of ${par:=word}.

Remove usage of ${par:-word}, which and mktemp. Quote filenames.

Ignore test error files, protect dot in .pc/

Merge with upstream

Added tests for bug with three-way-merging of old tip, tip and cwd.

Show all dirstate info for 'hg debugstate'.

Make test-pull work on slow machines, where hg serve needs some time to start.

Fixed test to notice .out file generated by run-test.

add note about -C to update message

Drop -t option from mktemp

Fix the directory and revlog collision problem This adds escaping for directory names so that directory foo.i doesn't collide with the revision data for file foo.

Fix undo after aborted commit bug Commit would overwrite undo.dirstate unconditionally, so an undo after an aborted commit would restore the dirstate from the aborted commit and not the prior transaction. This copies dirstate to journal.dirstate and moves it after a successful transaction.

Fix tests for short changeset hashes and hidden manifest hashes

Add a --time command line option to time hg commands

Provided platform dependent implementations for explain_exit os.system return code is system dependent.

Fix copy in subdirectories Spotted by Chad Netzer

Add changegroup hook for push/pull

Add paths command The following patch adds the 'paths' commands to show a named path, or list of available paths. In case anyone find it useful.

Shorten hashes displayed in log

Wrap RSS description in CDATA Problem spotted by Ollivier Robert

Add template to mktemp call Based on a patch from Soh Tk-r28629

Fix up test results No more errnos diff | sed changes .out message ok

Change sed patterns in tests to strip dates after spaces or tabs

Hide errno in abort messages

Make pull count jargon less confusing revisions are now synonymous with changesets, and not file changes

Fixes for annotate Handle files that aren't in the repo Handle empty files

Fix bug in exception handling for hardlink clone

hgeditor: hide checksum mismatch message from md5sum

Fix local file changes being ignored after non-branch merge Bug introduced in eea96285cbf9 Spotted by TAH

Update tests to match new addremove chattiness.

Get addremove to use new walk code. It is now more verbose than it used to be. If given file names, it prints nothing, as before. But if given patterns or nothing, it prints the names of the files it is operating on, to remove that air of mystery. It also now operates at or below the current directory.

Hack to fix missing '/' problem in URLs

Don't mark files with 'm'erge unless we're actually merging branches For 3-way merges, we were marking files as 'm', which should only be used for branch merges. This was causing files to show up in 'hg status' that aren't actually modified.

Added deprecation warnings if -t or --text is used for commits.

Changed more occurances of 'text' to 'message'.

Change all references to -t --text commit message to -m and --message.

Changed coding hint to BOM

Updated TODO.

There was an extra space after 'hg id' when there are no tags.

Updated help strings and test-help: - options -I/-X: always at the end, don't include them in the synopsis. - NAME is optional for hg revert - other small changes.

Added new code contributors, fixed Vincent's name, added hint on encoding.

Show filenames for hg export in verbose mode on a separate lines. This makes parsing by external tools much easier.

Fixes and cleanups to hgeditor: - "HG: merge resolve" isn't supported for a long time now. - detection of unchanged commit message if signing is turned off. - don't add manifest hash to commit message if not signing.

Check protocol versions This also allows the old unidentified protocol

Simplify content type checking

When pulling from a non hg repository URL (e.g. http://www.kernel.org/hg) you geta pretty obscure error (zlib: uknown compression type). The attached patch modifies hgweb.py and hg.py to supply and check a 'Content-type: application/hg-0.1' HTTP header for the branches, between and changegroup commands, so that we know it's a proper hg repo before snarfing the input. Comments appreciated!

Add tag -t, deprecate tag -m manifest hash: 893aa9732b500edfa6ffc099f76b00a88a5b1943

Update tests to use commit -m and default -u manifest hash: 6e4385453843031a712005a320d6000595b40d05

Update test output for status change manifest hash: da9effa63afe6ec22389e17f7fc2daeb3bb4f0e0

Add -m for rawcommit manifest hash: cf066b609ab4854a731c103f1d456d89cf5e1312

Change C to M in status

Add -m for commit and deprecate -t Index: hg/doc/hg.1.txt ===================================================================

Handle empty file list for annotate

Remove ls command

Refactor matchpats and walk Move core match function code to util Add some comments and whitespace Simplify options Use lambdas instead of always and never

Fix some line wrapping manifest hash: 43af5dafa55e01f89727096f4d6784317f3eb0d6

Merge from BOS manifest hash: 2276dbd96bb4221e579c871a1de2403c92c85659

Split make_file back out into make_filename and make_file. It turns out that make_filename is useful by itself.

If the argument to make_file can act like a file, return it. This is useful for code that calls command functions, but doesn't want to send I/O through the filesystem.

Merge with Matt's tip.

Update tests to reflect walk changes.

An empty .hgignore file must cause us to ignore nothing, not everything!

Update docs for annotate and diff.

Convert annotate over to walk interface. Add emptyok parameter to walk and matchpats, for commands that require at least one name.

Convert diff command over to using walk code.

Add name matching to status command.

Only walk over files that match our criteria.

Turn make_filename into make_file, which returns a file handle.

Fix typo.

Get commands to raise Abort instead of ui.warn(...),sys.exit(1).

Add a source designator to the walk methods. If the source is 'f' (the filesystem), the file definitely exists in the filesystem. If 'm' (a rev or dirstate manifest), the file may not still exist with the given name.

Merge with Matt's tip.

Get add and locate to use new repo and dirstate walk code. They use a walk function that abstracts out the irritating details, so that there's a higher likelihood of commands behaving uniformly.

Work on walk code.

Add doc/Makefile to MANIFEST manifest hash: 1fc29da9334caa71ff8df55c52747f9c93df7e0f

Fix verify error reporting bug Spotted by Chris Mason manifest hash: d5a6e5cb65d2de65a68d1f85c8692e79622844d3

Change hgit revision lookup to use repo.lookup

Fix hgit usage of repo.changes and fancyopts to reflect current hg api

Fix typos in FAQ

Be even more specific with .hgignore regexps, added *.swp files. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Be even more specific with .hgignore regexps, added *.swp files. manifest hash: 6664148b687983a41ef50d5bd4fd40426fb96621 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC2TThW7P1GVgWeRoRAhObAJ9ZuBxwCBSTZ9MSonw4q1EaluxMMQCfdrBo Czu2RdQEK4RZQh/ngzm73p8= =8XOM -----END PGP SIGNATURE-----

Fix up ignore regexps.

Make annotate use option --rev instead od --revision like other commands. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Make annotate use option --rev instead od --revision like other commands. manifest hash: fe9c9cd9d42657f60d302b557f1f33640fd51199 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC2LAwW7P1GVgWeRoRAqYKAJ4tiLIVTRN0Ot6bjrEZRc9VFrk3zwCdGx/C PhOGWMHVlNYGZxmdXridIc4= =J7Cn -----END PGP SIGNATURE-----

Some cleanups in commands.annotate(). -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Some cleanups in commands.annotate(). manifest hash: 9581ad3bb9ebc418e4772158c505e34b92496e92 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC2K+nW7P1GVgWeRoRAr3VAKCGvKbhmG4yweZTgmxIgaZlmz16HQCdFupq BKcWfEn17Y1l6IDbGS0rDyI= =/fR/ -----END PGP SIGNATURE-----

Added missing newline after two error messages. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Added missing newline after two error messages. manifest hash: c730cdf92c66ee5b44a4cd9b67f72deb844e4010 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC2B0mW7P1GVgWeRoRAjXJAJ48fbg6jXN65pBPGW/YmWn9OtKakACgjnr9 DPySaeLr3/bU7KhFdZPI7/4= =Lvsx -----END PGP SIGNATURE-----

Merge with myself. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Merge with myself. manifest hash: e47e1ba87ecb28a08f819401fd8c2a88bc830261 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC168rW7P1GVgWeRoRAmknAJ0ea1BrnM1KSnfPqkYpurFpV+booACcDGNh ka6ciaH1pQLhOyKgqdbqwOA= =pOV4 -----END PGP SIGNATURE-----

Show filename for hg export in verbose mode. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Show filename for hg export in verbose mode. manifest hash: 4fbb7bb566ef04e64079fb1fd61974ad47f22e7c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC15svW7P1GVgWeRoRAleQAJ4kXmyj+56kTb5lV9VrQYpu4O3h5ACfXU5W M0TB/OvU0g5uvudZVQMsJd0= =yq7Y -----END PGP SIGNATURE-----

Use dirstate to check if .hgtags needs to be added. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Use dirstate to check if .hgtags needs to be added. manifest hash: f90af1553754eb703fc457ffdd5ded0de6fa47e0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC15i1W7P1GVgWeRoRArDvAKCSxWDCbwU12ICwwVUoe753H8GYIwCfZGs0 HcL8cOp+eHz85AMJJE/xfck= =1xKK -----END PGP SIGNATURE-----

Fix synopsis: hg forget needs at least one file name. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix synopsis: hg forget needs at least one file name. manifest hash: 1386189a11f9bc539ae2c4bf93333235931d8bc6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC14i7W7P1GVgWeRoRAj3OAKCBPkYzoxOHu0Xp/vZ6Myz6JGM4hACgimU+ Gw1Av4ESM2ivORd8ulHMdBc= =kDiv -----END PGP SIGNATURE-----

Use changelogentry.tmpl for search results, too. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Use changelogentry.tmpl for search results, too. Since both are lists of changelog entries, they don't need to look different. This fixes a bug where only changelogentry was updated, but searchentry not. manifest hash: 9bfe7a3dd4512d3ee4e5538f369371bce6d55520 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC13zrW7P1GVgWeRoRAghNAJ9Agd+uPQ2iGdHAnjebr2R/RzAzUACdEyWq +yKY7wp16TD72ls6Q49LHJg= =9aSM -----END PGP SIGNATURE-----

Changed command synopsises to match style of common UNIX tools. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Changed command synopsises to match style of common UNIX tools. manifest hash: cf62235e46f5c06ac5a3c88cb61e9b57d35fe222 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC13YhW7P1GVgWeRoRAnSOAKCOtrYHZ2XMTjpphY/G2UZHcJcZeQCdFsgv D5Hu+s9ahVX8hns2ZbQpriI= =g6NW -----END PGP SIGNATURE-----

Make "hg parents REV" work (again?) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Make "hg parents REV" work (again?) manifest hash: d14db0d23b539ad0b754a51a83926d14f1be9a6e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC12adW7P1GVgWeRoRAtknAJ9TeUybLWYWY+Bi2b5grmAspgfemwCeP9cd 6mYSTWIsovCqW59KIrEvVVo= =u5nR -----END PGP SIGNATURE-----

Merge with TAH manifest hash: 197e0d1a0d7376a9eb72381330462f06490ab821

Make makelock and readlock work on filesystems without symlink support. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Make makelock and readlock work on filesystems without symlink support. This way you can have a repository on a fat partiton, e.g. a USB stick. manifest hash: cea2c120ef2b25a50c5d98b59648f773feefe470 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC1t5yW7P1GVgWeRoRAsKjAJ9BFcn/EqBK/dmJ4BY1pPIZIbDDJACghN3p VCQS6CJ72MHpzhOOsnOpHzE= =laDT -----END PGP SIGNATURE-----

merge program setting from hgrc wasn't used. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 merge program setting from hgrc wasn't used. manifest hash: 49da647e02534f51324a7a955a34c64c05bd8fa0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC1pKjW7P1GVgWeRoRAt6AAJ9ZB6NerDpWA/k2ZZeN6VUsSDkB8wCePhMd Xr+Tb86zo+xFhHq7YkDvLak= =+BY9 -----END PGP SIGNATURE-----

Fix default values and add interactive setting to [ui] section of hgrc docs. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix default values and add interactive setting to [ui] section of hgrc docs. manifest hash: 211eea218970b45b2a0cdc822d5b6610a89ffbd7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC1pE8W7P1GVgWeRoRAof+AJ4mpm3DCRqh+9To3Gn4bpC7UGcTnQCfVIWN 5VT9pqdP6/06tH8nYgW55f4= =uNyy -----END PGP SIGNATURE-----

On importing the result of 'hg export', parse while reading and drop headers. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On importing the result of 'hg export', parse while reading and drop headers. manifest hash: 385cb4205bb6e4291a412d740400de44bd2e4014 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC1otNW7P1GVgWeRoRAiSpAJ4jGhjyEnI2aqCM6pgC8KWSWRkDugCgkVMK rd/YNziDK3TNRhI3yKNrLVw= =w6ht -----END PGP SIGNATURE-----

Removed extra spaces for default parameters according to PEP8. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Removed extra spaces for default parameters according to PEP8. manifest hash: 0f6bcc95adf406c8f6dafd92b7c7d3523b6dfe2c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC1oNhW7P1GVgWeRoRAn76AJ4m8rFUeeUDRC0qVEmjjmPClmAFsQCdE3rN Juv2dSoGteRm0DBXz7xnF4c= =PMki -----END PGP SIGNATURE-----

Removed duplicate use of os.path.normcase(). -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Removed duplicate use of os.path.normcase(). manifest hash: cccacfb66a4de9abc20095b28e6bab9b51dc4fa9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC1n0LW7P1GVgWeRoRAueGAJ9256Jiwv4QbrFIV3Px/SmBMkddjQCbBop/ J2Yi2np72OAKVPhFhCijH6s= =aAyf -----END PGP SIGNATURE-----

Use python function instead of external 'cp' command when cloning repos. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Use python function instead of external 'cp' command when cloning repos. Inspired by a patch from Stephen Darnell. manifest hash: b525b0bf40f349b362db7c46d62be41572ef65cf -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC1ncZW7P1GVgWeRoRAiJmAJ9GaCPaG6yOKb72I+SpDDdcdXTISACePD0H GR/F+qqzi2imdgIV77ziLcQ= =YVd2 -----END PGP SIGNATURE-----

Multiple cleanups of things detected by pylint. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Multiple cleanups of things detected by pylint. Spacing, multiple statements on a single line, overloading builtins, except statements without exception type, unused variables, etc. manifest hash: 457b33b30200d9f71ca707a0bef78053d9091107 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC1jOEW7P1GVgWeRoRApr5AJoClL7FkGXT9Z36xF71zdVH463O0wCeJJwb gJSn0jHlLZ3m25OI+BuZCrI= =HVDq -----END PGP SIGNATURE-----

Removed extra newline in hg log when not using the --patch option, fixed tests. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Removed extra newline in hg log when not using the --patch option, fixed tests. manifest hash: 4d83d4af68581affe4cd2dacf840ec78bf18311e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC1jJdW7P1GVgWeRoRAkoIAJ4kI8WFisp8fJTMsUCddLwK0O1mHQCgj+fx XDIXrDpUULYSSck3eD4QHY4= =jKKB -----END PGP SIGNATURE-----

Fixed tests. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fixed tests. manifest hash: f6f36e6f95ea99efccc84dfa1d0af63d414a0eba -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC1hsCW7P1GVgWeRoRAtbyAJoDpbSygoutryu3P/miCpX2Q/LA8gCgiClo P+1ZpH0gycio/V4CKmj5Hlo= =JVBT -----END PGP SIGNATURE-----

Teach convert-repo about tags Git tags are bad, very bad. More importantly, they're horribly inconsistent. This drops tags which don't appear to work like most of the others. manifest hash: f2dda9e9a3ae8a0d84b19e496059b8a795b8e603

Be quiet about broken pipes manifest hash: 3163ebe2f15c3a577456cfdcd2b136c3c7cf7378

convert-repo: deal with packed git and other fixes call out to git-cat-file directly to deal with packed files use git-diff-tree --root to handle import of first commit quiet some dirstate warnings fix parent logic in commit whitespace bits topological sort fix manifest hash: 2943af0168dd2f5e85bba6515fd08687e264863f

HG environment variables take precedence over hgrc manifest hash: c128b53429f861c0b75c2a81c6ad4907e4779810

Minor merge fixups return a proper errorlevel on abort let force jump across branches catch exception on unlink manifest hash: 6787814cd75e9f9623c56dc36f865afd54f56bfa

Make manifest lookup use changeset ids manifest hash: 83cf1ac9c68ad9e8de29d2c629c8a06eaeeeae15

Repair the hgweb search interface manifest hash: f5c644f14b31da897dc66f96c2852ae1f11f43f1

Hide file hashes in log There are six different kinds of revision numbers and hashes: changeset hash and local number manifest hash and local number file hash and local number We really ought to expose only the changeset hash and local number, so begin hiding the others from the end user manifest hash: 40d07cc930e84a9283d5e03ade23e3454401e148

Reapply startswith() changes that got lost with stale edit manifest hash: 16d7feedd561591a21727a4c13a1223019d802a7

Added tag 0.6b for changeset 4ccf3de52989b14c3d84e1097f59e39a992e00bd

Turn off signing with hgeditor by default manifest hash: f2732475351ee22d78e0dab629db03f1f215b21f

Revert hgeditor change to manifest bits -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Revert hgeditor change to manifest bits I'd rather have a blank line at the top. This code primarily exists to show possible methods of signing changesets so I'm not very concerned about conciseness or performance. I should probably have all the signing commented out or disabled by default. manifest hash: 764da8d65bdaf9b45c7e3efd6cd2b4ee70979417 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFC01sdywK+sNU5EO8RAr2BAJ9Uq0XberFrYyehvmoKgE8p/j0XFQCdFPJr DPDMbKeBHwK/yMiileBFW8o= =DvnD -----END PGP SIGNATURE-----

Revert hgeditor md5sum change -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Revert hgeditor md5sum change My copy of md5sum doesn't do --status manifest hash 509a316ca72aca095c590fb120eb2ee8260814dd -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFC01pKywK+sNU5EO8RAkDWAJ0dWHz3Vp5oR2be9k3d1Km2Br53xgCgrBLF Ja2tOYCu/nP4sh3CsOsIO78= =zHkj -----END PGP SIGNATURE-----

Sort files for removal

Handle undeletion of files when checking out old revisions Spotted by Marc Singer

Actually move .hg into ignore

Alternate fix for SIGHUP on the other OS Suggested by K Thananchayan

Fix up test for update flags

Remove references to 'cloning by hardlink' from tests. # HG changeset patch # User Andrew Thompson <andrewkt@aktzero.com> # Node ID c12a49438454e9782ff7eb9b11841e7b9406fbab # Parent b3bba126b04ab2f24274a1bcf5a224c6317c8e0d Remove references to 'cloning by hardlink' from tests.

hg clone stored path fix # HG changeset patch # User Mikael Berthe <mikael@lilotux.net> # Node ID a08808d8ffd811c1174216c598da5c27d20bc2c9 # Parent b3bba126b04ab2f24274a1bcf5a224c6317c8e0d hg clone stored path fix The abspath() has been lost in changeset 634 (da5378d39269).

Make consistent use of str.startswith() in conditionals. # HG changeset patch # User chad.netzer@gmail.com # Node ID 45db196de89a15fd045cd789f701b0180fd276f1 # Parent fafc16f705b6cb413897577b67918af55e1baafe Make consistent use of str.startswith() in conditionals.

Change MANIFEST.in to recursive-include the contrib/ folder. # HG changeset patch # User Andrew Thompson <andrewkt@aktzero.com> # Node ID e5dc09266c217bc50b91d710a045c679411e4727 # Parent c55df1c38618035c8e94e7af025e2b7f38f6d743 Change MANIFEST.in to recursive-include the contrib/ folder. Now sdist picks up git-viz again.

More IE friendly diff output related templates. # HG changeset patch # User Edouard Gomez <ed.gomez@free.fr> # Node ID 6eee9b54c53c41643192c7920db642c984a00a21 # Parent 8b8f710bb65875d588044c3615cf42180aee23ff More IE friendly diff output related templates. I thought i could use CSS to render properly the diff blocks in IE. But i was obviously too optmistic and didn't realized that IE only renders preformated text for pre tag content... So i had to rollback some of my changes to accomodate to this IE bug/limitation. A diff blocks become pre tags, and diff lines become span again. Hopefully, the pages continue validating.

Move hgrc documentation out to its own man page, hgrc(5). # HG changeset patch # User Bryan O'Sullivan <bos@serpentine.com> # Node ID 5076cf1fd6a1b8eb410e5e03cb004ca6a52a30f9 # Parent 7369ec5d93f2ffd490a43970edd9adf8d2bbe269 Move hgrc documentation out to its own man page, hgrc(5). The new man page expands on the existing documentation by describing the file format and the purpose of each section and field.

Move .hg into ignore()

.hgignore speedups patch incorporating Matt's feedback. # HG changeset patch # User mwilli2@localhost.localdomain # Node ID c78a9d4398c63b6bc689e456e1cab3850a846c8a # Parent 8c89408a7154d2da94766e957a088407fd0fef93 .hgignore speedups patch incorporating Matt's feedback.

Dont trap SIGHUP on the other OS # HG changeset patch # User Edouard Gomez <ed.gomez@free.fr> # Node ID 34a547cb33fe515ef4cdc8ccd173546671253ae9 # Parent 8c89408a7154d2da94766e957a088407fd0fef93 Dont trap SIGHUP on the other OS HG doesn't work anymore on the other OS since signals are trapped. This is due to the fact that as explained in Python docs not all signals are defined for all platforms, so python was complaning about missing signal.SIGHUP.

A number of minor fixes to problems that pychecker found. # HG changeset patch # User mark.williamson@cl.cam.ac.uk # Node ID 55d38977b7f2e73b8c1090179928ac96c8922b90 # Parent b3bba126b04ab2f24274a1bcf5a224c6317c8e0d A number of minor fixes to problems that pychecker found.

hgeditor: Remove EMAIL default for HGUSER, comment editor selection # HG changeset patch # User Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl> # Node ID a4c688c8273e392b1bf33cfc736e00ec752a415e # Parent be12687d4bf0ce16c4207bef85c188de66efbf53 hgeditor: Remove EMAIL default for HGUSER, comment editor selection HGUSER is already set to EMAIL by Python code if needed

hgeditor: Remove temporary files even if interrupted # HG changeset patch # User Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl> # Node ID 1292f1fd015767d9682ba2ff5f8377fb6760c3a5 # Parent a4c688c8273e392b1bf33cfc736e00ec752a415e hgeditor: Remove temporary files even if interrupted Index: hg/hgeditor ===================================================================

hgeditor: Simplify manifest hash adding # HG changeset patch # User Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl> # Node ID be12687d4bf0ce16c4207bef85c188de66efbf53 # Parent 341d27f865903223f8bf12382e3596167228a1c1 hgeditor: Simplify manifest hash adding I hope no one will miss the colon.

hgeditor: Fix some parameters to commands # HG changeset patch # User Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl> # Node ID 341d27f865903223f8bf12382e3596167228a1c1 # Parent 5c5d1484b51a53918575a199ab8985160f0ce2d7 hgeditor: Fix some parameters to commands

Pass username to hgeditor, remove temporary file # HG changeset patch # User Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl> # Node ID 5c5d1484b51a53918575a199ab8985160f0ce2d7 # Parent 8c89408a7154d2da94766e957a088407fd0fef93 Pass username to hgeditor, remove temporary file

Add rss tag in the changelog/filelog html template. # HG changeset patch # User kreijack@inwind.REMOVEME.it # Node ID 20edcc82038fce8460076ca5723fbbb919016356 # Parent 8c89408a7154d2da94766e957a088407fd0fef93 Add rss tag in the changelog/filelog html template. This patch add rss tags in the changelog/filelog template html pages. This tags permit the browser to detect the rss feed.

Move commit hook after commit completes -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Move commit hook after commit completes manifest hash: bc65b570af67ee4748efaba2ff8a6cddf91b8a14 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFC0ZwSywK+sNU5EO8RAuAjAJsHGTXsOCnxq+xbq/Q0H+ayGnzaiQCfdWn6 or+IWK3sjYILYncTxMFZJdE= =mQb7 -----END PGP SIGNATURE-----

Whitespace cleanup -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Whitespace cleanup manifest hash: 7abcbe23247dd5b7dea6fa44fb80d9f909cf6829 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFC0ZvmywK+sNU5EO8RAhhDAJ0YXOx5B2F/3NjFB+5YcUtkHqVyuQCgnNyp tWbRrjDz/SbKz/tFAsxJDqo= =xB66 -----END PGP SIGNATURE-----

Generate a friendlier except for failed lookups -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Generate a friendlier except for failed lookups manifest hash: 1a4384b791bba2107604e56168166dfcbfb54086 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFC0Ws6ywK+sNU5EO8RArBGAJ9EA0mCNGqO+w6LaO358sVe19o7lQCdGffF MmQ/ZIvxoJOjYTo+PLBWMqI= =4VIg -----END PGP SIGNATURE-----

dirstate.forget() takes a list -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 dirstate.forget() takes a list manifest hash: e444474a5ac76d3562ee8c0211e1a88ec53155ef -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFC0WO+ywK+sNU5EO8RAlmYAJ9pcSgpvvuqLzfUkeApXZyOb3j6pQCgi9Te e8ZI236WNWfyrwEASxFIeLM= =yDVZ -----END PGP SIGNATURE-----

Warn about bogus ignore expressions -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Warn about bogus ignore expressions manifest hash: 7beb33a1f0879a1d2457953187a523417bc7a101 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFC0IPqywK+sNU5EO8RAsOdAJ0bFxZoUjSk/BxWZ9C50SlxlDBlBQCeKbu0 QVzZZKIFlDRVWOsi8zfamHA= =zAVL -----END PGP SIGNATURE-----

Fix out of range regression -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix out of range regression From: Filip Brcic <brcha@users.sourceforge.net> The old revlog.py issued "index out of range" error when cloning the repository Now I have reverted the parts of revlog.py to the old state when prev was initialized as -1 and later assigned self.tip() only if that is possible. Previously prev was always initialized as self.tip() and that is where the out of range error was. manifest hash: c94c9aee8b6d382ef52c3981f306a6e7e5f4c4d1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCzzIxywK+sNU5EO8RAtlcAJ0TX9FXuC2c3YHuYXNwqZhdzPWUlgCggq+a yJzUKDKH/gvnD3Tx3jcmCn8= =euPi -----END PGP SIGNATURE-----

Make cloning by hardlink quiet again -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Make cloning by hardlink quiet again manifest hash: bd12b4deedb99e06415619f858b95b566a6d329e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCzvGGywK+sNU5EO8RAiCzAJ9iCRbyijLT7PqkgCI9eFn+9pl+KQCfdcB1 yHxfvLCL39wAAcBo6Hebpvo= =qne+ -----END PGP SIGNATURE-----

Fix corruption resulting from skipping parts of a revision group -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix corruption resulting from skipping parts of a revision group We were occassionally losing track of what revision a delta applied to when we skipped over deltas we already had and applying the delta against the wrong base. This could result in coredumps from mpatch, consistency errors, or failed verify. manifest hash: fcf20a8abfd81f08fae2398136b2ed66216b2083 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCzu5SywK+sNU5EO8RAi10AJ9cqIfQzOzbcdH36t1LR/rY+UMtHwCeM79p Dtv+Jh0McLZr6nf4iJyhDgI= =5o6U -----END PGP SIGNATURE-----

Non-grouping regex for ignore -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Non-grouping regex for ignore Suggested by Mark Williamson manifest hash: dfd4686e7ac9f96e79da600edf299ed64213e05d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCzjX3ywK+sNU5EO8RAnc1AJ4/sKzyZJiRs6UzE3uksE2U9rOkVQCeJsZf PhHsNtEt/WyL+v44mBfk8Mk= =e+Qy -----END PGP SIGNATURE-----

Fix an odd revlog bug -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix an odd revlog bug If revlog had a cached -empty- revision, as opposed to no cached version, it could get confused. This cropped up in verify on a particular repo. manifest hash: 90ccf122087f6bbcb4322cb9d9bb8124610ba886 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCzjRaywK+sNU5EO8RAgVEAKCv3WBJt1rBOX0UlTDXFPygPIru+gCfTZxJ CEz1lYny1gkQ+haGY26QdBs= =C/K5 -----END PGP SIGNATURE-----

Fix bug in reverting deleted files -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix bug in reverting deleted files Force updates and reverts wouldn't restore deleted files in the working dir. This should fix that. manifest hash: e14809399bbc63da42e8c8f694cc8acf31e537f7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCzjOJywK+sNU5EO8RAqVLAKCC1BF6JhNiO6n4LJGvy9RBTgOelwCdF9Tr sADRnovYt9xSnUGmd1Om9JQ= =SdcP -----END PGP SIGNATURE-----

Experimental ignore regex speed-up -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Experimental ignore regex speed-up manifest hash: c6922086fb78201b60ba8cbde5b51512225ebcc8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCzWkvywK+sNU5EO8RAohzAJ9BwkFJQzs0QRH71r1Y1Wm0QCSmEwCgrESQ Ej3Kt/y0JdhOJzQLsAiufqk= =SPjY -----END PGP SIGNATURE-----

Attempt to read all remaining remote output at close -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Attempt to read all remaining remote output at close manifest hash: e1eda33686726559849388b048a838933862fe89 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCzM60ywK+sNU5EO8RAudsAJwPW/MPUBXFV13UbYmZyiwdzSr8QwCfYJqc l1ZDWPZPTN5UGUlfs0CCu7Y= =2Tat -----END PGP SIGNATURE-----

update test-hup permissions -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 update test-hup permissions manifest hash: a041df3958fb7508e34ce7c736c196217bbcf8a7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCzM2SywK+sNU5EO8RAnKvAKC1+ilD53KpBwplk5iaUMra4h3GDgCgsM4f R+RswPBjW8I51vNyvZ45AvM= =dQjV -----END PGP SIGNATURE-----

Show remote client output with "remote:"

this patch permits hgweb to show the deleted files in the changeset diff # HG changeset patch # User kreijack@inwind.REMOVEME.it # Node ID 08b33970007e753f12b2b2f9d0e169981a6e8c3c # Parent 7369ec5d93f2ffd490a43970edd9adf8d2bbe269 this patch permits hgweb to show the deleted files in the changeset diff

Performance enhancements for manifest.add() # HG changeset patch # User mason@suse.com Performance enhancements for manifest.add() Improve manifest.add performance by using bisect to insert/remove changed items into the manifest list. This also generates the manifest delta directly based on the changes being made.

typo in help message. From: "Aneesh Kumar K.V" <aneesh.kumar@hp.com>

Update tests

Catch SIGHUP This should reduce the chance that a repo we're connected to via ssh gets interrupted without doing rollback.

Switch push over to the new scheme Now push works transparently with any repo with lock and addchangegroup. Currently this is local repos and ssh.

Add addchangegroup to the ssh protocol

Add a scheme for handling remote locking This adds an object that remembers to unlock the remote repo on destruction and lock/unlock functions for the ssh protocol. The remote repository should also unlock itself when the connection goes down.

Fix up the broken bits in findoutgoing

Move the empty changeset detection out of findincoming to pull This lets us reuse findincoming for findoutgoing

Protocol switch from using generators to stream-like objects. This allows the the pull side to precisely control how much data is read so that another encapsulation layer is not needed. An http client gets a response with a finite size. Because ssh clients need to keep the stream open, we must not read more data than is sent in a response. But due to the streaming nature of the changegroup scheme, only the piece that's parsing the data knows how far it's allowed to read. This means the generator scheme isn't fine-grained enough. Instead we need file-like objects with a read(x) method. This switches everything for push/pull over to using file-like objects rather than generators.

Add a repo method to report repo device This is used to establish whether repos are on the same device for hard linking. Remote repos all return -1.

Slim down and update README a bit

Provides output option to cat command # HG changeset patch # User thananck@yahoo.com # Node ID c838b9c2c71b1d64b8bde786f6470b30f23962de # Parent 7369ec5d93f2ffd490a43970edd9adf8d2bbe269 Provides output option to cat command expand function in commands.doexport is moved to toplevel and renamed to make_filename. The 'cat' command now accecpts --output <pattern> switch to specify the destination file. Index: hg/mercurial/commands.py ===================================================================

Update documentation of hg tag # HG changeset patch # User Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> # Node ID 8fc9bfabae06cba91b05c265545bcce2654dab2f # Parent 7369ec5d93f2ffd490a43970edd9adf8d2bbe269 Update documentation of hg tag This updates the FAQ, manpage and adds hg tag to the list of commands in README. Index: hg/README ===================================================================

Remove debug print from locate code. # HG changeset patch # User Bryan O'Sullivan <bos@serpentine.com> # Node ID 5240abb57899b745f2e6465be29d9d54c4777364 # Parent 13b74665cbdf735a91f231956d0fe73e446340ea Remove debug print from locate code. Index: hg/mercurial/commands.py ===================================================================

Clarify man page entry for locate a little. # HG changeset patch # User Bryan O'Sullivan <bos@serpentine.com> # Node ID 13b74665cbdf735a91f231956d0fe73e446340ea # Parent fb74eaa2b5b763ad5591b2e51dbb377bf8342064 Clarify man page entry for locate a little.

Use repo.getcwd() in a few obvious places. # HG changeset patch # User Bryan O'Sullivan <bos@serpentine.com> # Node ID fb74eaa2b5b763ad5591b2e51dbb377bf8342064 # Parent ebf5eba347a17a5c09000b3342caf350cd060a1b Use repo.getcwd() in a few obvious places.

Add locate command. # HG changeset patch # User Bryan O'Sullivan <bos@serpentine.com> # Node ID ebf5eba347a17a5c09000b3342caf350cd060a1b # Parent d2994b5298fb20f87dc1d4747635b280db3c0526 Add locate command. Used for finding files with names that match specific patterns, such as "*.c". This patch also introduces localrepository.getcwd, which returns the current directory relative to the repository root.

Fix quoting for RSS links Spotted by Mikael Berthe <mikael.berthe@lilotux.net>

Cleanups for repo.pull Use repo.pull in pull and clone commands Teach clone about ssh:// (temporarily) Fix up shutil issue on failed pull

Add an sshrepository class and hg serve --stdio

Change remote repository to httprepository

Add generic repo commands for pull and push

Add a function to calculate the outgoing changegroup

Attempt to handle RSS URIs properly -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Attempt to handle RSS URIs properly manifest hash: 1546939c11a8640ca56f0b0f5c7bdc878b4faa67 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCycliywK+sNU5EO8RAukgAJ9eoJdqTiTQ8xSsSeHMIBmHnnQk9QCfQpFL SAJKUYknvv4IJDUyHjQc61k= =zGdJ -----END PGP SIGNATURE-----

update tests -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 update tests manifest hash: 70079385599132ca8f90582e1f9317ca46167532 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCyaISywK+sNU5EO8RApnGAJ0blIxE0tKPzcRQUDAHCLe5KmUSNgCgjGoA kV4Os9FG1NmGaCysPIsKwts= =Ee67 -----END PGP SIGNATURE-----

Handle unrecognised options correctly. # HG changeset patch # User Bryan O'Sullivan <bos@serpentine.com> # Node ID 837a023781a0228e5791e8e278129d2d54d13f99 # Parent d2994b5298fb20f87dc1d4747635b280db3c0526 Handle unrecognised options correctly.

open .hgtags as binary # HG changeset patch # User thananck@yahoo.com # Node ID 2bd20bb06f817796d76b8e126f4a685426c4faf4 # Parent 7a240687674e6cf5a8dfd45973d7e3978b89af79 open .hgtags as binary The '.hgtags' file, in tag command, is opened as binary for interoperability with the other OS

Fix zombie files in merge # HG changeset patch # User maf46@burn.cl.cam.ac.uk # Node ID 57667c9b93a5a743e4629d15a0e6bd76699130c3 # Parent d2994b5298fb20f87dc1d4747635b280db3c0526 Fix zombie files in merge Keir Fraser observed the following: > I made a small test case that illustrates the bug in merging changesets > with 'hg remove's in them: > > 1. Create a repository A containing files foo & bar. > 2. Create clone called B. > 3. A removes file bar, and commits this removal. > 4. B edits file foo, and commits this edit. > > Now, if B: > # hg pull ../A; hg update -m; hg commit > Then bar remains deleted. > > If A: > # hg pull ../B; hg update -m; hg commit > Then bar is resurrected! > > It looks as though, when you merge across a branch, any deletions in > your own branch are forgotten. > ... > Fixing this is a must, as zombie files are a real pain. :-) Keir later patched our local copy of hg as shown below, which fixes the problem. I've also enclosed a test which captures the test Keir outlined... Files deleted on a branch should not automatically reappear in a merge Patch notes: 1. The first chunk does not change behaviour, but cleans up the code to more closely match check of 'force' in the second chunk. I think it makes the code clearer. 2. The second chunk fixes two bugs -- i. If we choose to keep a remotely-changed locally-deleted file, then we need to 'get' that file. If we choose to delete it then no action need be taken (it is already deleted in the working manifest). Without this fix, choosing to delete would get a Python traceback. ii. The test for whether the file was remotely-created is insufficient. It is only true if f is not in the common ancestor. Otherwise the file was deleted locally, and should remain deleted. (this is the most important fix!) Index: hg/tests/test-merge6 ===================================================================

Output file of 'export' is opened as binary (other OS) # HG changeset patch # User thananck@yahoo.com # Node ID 7a240687674e6cf5a8dfd45973d7e3978b89af79 # Parent d2994b5298fb20f87dc1d4747635b280db3c0526 Output file of 'export' is opened as binary (other OS)

Stop patch description import at diff -r -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Stop patch description import at diff -r manifest hash: cc269f69c26ad4fba1fdaeefe2dc8191a0669fe0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCyZmyywK+sNU5EO8RAkODAJ9d/JYpBOZiOcQxlz0n2VtIPtK/IgCgl2Lj caGbq4yn4RxzBQqqIoQzOTQ= =9fHy -----END PGP SIGNATURE-----

Demand-load most modules in the commands and ui modules. # HG changeset patch # User Bryan O'Sullivan <bos@serpentine.com> # Node ID 059c6e42fc4221816e26a72bef8cf780891989ca # Parent d2994b5298fb20f87dc1d4747635b280db3c0526 Demand-load most modules in the commands and ui modules. This improves response times for a number of simple commands, as the Python interpreter doesn't end up loading modules that it never uses. There's less benefit to demand-loading in other modules.

On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote: # HG changeset patch # User Alecs King <alecsk@gmail.com> On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote: > On Sun, Jul 03, 2005 at 12:49:27AM +0800, Alecs King wrote: > > Hg is really very nice. The only feature i miss from git is the > > whatchanged -p, which shows a diff along with a changeset. > > python before, i just dig into the mercurial/commands.py a while and > > see what diff(), dodiff(), export(), show_changeset(), log() would > > normally do. There might be one thing or two missed or wrong. But here > > it is: a '-d' option to 'hg log' showing the diff info. You can use 'hg > > log -d' to show the whole history with the diff or 'hg log -d <file>' to > > show that info of a particular file. And also works with the '-r' > > option. > > Let's use -p. We're going to be combining the global and per command > switch namespace shortly and the global -p will disappear. Okay. '-d' changed to '-p'. Just like 'whatchanged -p', now we have 'hg log -p'. > Also, the argument list for show_changeset is getting a bit unwieldy. This time i remain show_changeset untouched at all. Only changed some bits of log().

* clean up error handling when user requests to use a non file object # HG changeset patch # User shaleh@speakeasy.net # Node ID 1ae21732349f5b6dba2941609a044d9c365a6fb2 # Parent 94744f6fe0e7c19b10fab7eb24249f3eeaa5489a * clean up error handling when user requests to use a non file object - use os.path.exists() to verify the item exists - use os.path.isfile() to check whether the item is a file or not diff -r 94744f6fe0e7 -r 1ae21732349f mercurial/hg.py

check export options for changeset before running # HG changeset patch # User shaleh@speakeasy.net # Node ID 0cc64f4312540b2081c76dc589cc825d734676d8 # Parent f7bfe827ea381afc89f486b2d93d7f4fe86de04d check export options for changeset before running diff -r f7bfe827ea38 -r 0cc64f431254 mercurial/commands.py

[PATCH] hg tag: local tag support in file .hg/localtags -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] hg tag: local tag support in file .hg/localtags From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> Support local tags in .hg/localtags Also minor cleanups in related functions manifest hash: 553b2e896fed3c9055ed18482ce15cfaa4fc41ce -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCyYdJywK+sNU5EO8RAhohAKC2I3U44EXi+k4ofo5AWHBOg+94bgCfcbzs VQ2yWkPPHZycjtswOBmepa8= =v5AX -----END PGP SIGNATURE-----

Add username/merge/editor to .hgrc -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add username/merge/editor to .hgrc These take priority over the equivalent environment vars Deprecate HGMERGE, HGUSER, and HGEDITOR in docs Add ui section to docs Remove undocumented HG_OPTS Raise username code out of changelog class Make tests ignore ~/.hgrc manifest hash: d127ef02bc5266036b4c77a55319519e91bd475b -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCyM5NywK+sNU5EO8RAuU7AJ9zKk1TFrJXHM04jOOJJeBSp8jlTgCeP+tr qwGFd+WaNqTepZ0wun5g9Uc= =QEBu -----END PGP SIGNATURE-----

[PATCH] Parse and use header data from an hg export'ed changeset -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Parse and use header data from an hg export'ed changeset From: Andrew Thompson <andrewkt@aktzero.com> This should make it easier to import changesets that are hg export'ed from other Mercurial users: Add a routine to catch the user from an hg export'ed changeset. Add user to commit call. Add trap for changelog snippet, which is promoted to the beginning of the commit text. manifest hash: cf5b068f4cec411ff8b9fa3db324ab44ed012778 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCyMXAywK+sNU5EO8RAqk5AJ9rC4ZwzcpDfxrNqIBrrTj6eL2mzQCgmZ5O wSkis2J9Xz2wOZAhjVcxIgQ= =32D+ -----END PGP SIGNATURE-----

[PATCH] Fix thinko in "serve" man page entry. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Fix thinko in "serve" man page entry. From: Bryan O'Sullivan <bos@serpentine.com> manifest hash: 38873ef90d0a418810fe6bb9d4b8357b63e88cc3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCyMCZywK+sNU5EO8RAhKuAKCjqdqGs1OiU+urYjYGC+nVYFpIygCfd/UC Ln4/JF5J87nN/bHPKKQ2uh4= =wFAq -----END PGP SIGNATURE-----

[PATCH] Get "hg serve" to optionally log accesses and errors to files -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Get "hg serve" to optionally log accesses and errors to files From: Bryan O'Sullivan <bos@serpentine.com> Get "hg serve" to log accesses and errors to files. manifest hash: 573ef524d84cc7d2777f5fd982f2ef47f4bcf668 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCyMA5ywK+sNU5EO8RAp1eAJoD6Qqy6XcGInzZKdo0Qp7gLttYzACfRywL fSGapmCAIaZPoBvoxXTk8Zo= =ZicU -----END PGP SIGNATURE-----

Split wrapped demandload line -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Split wrapped demandload line manifest hash: e562d8b7e2c66c83dfc8a09c503edb1dac0fe997 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCyL/sywK+sNU5EO8RApE9AJwKG7SYhyT3uDteHecQKJPMm+nuAgCglKNp MDDX+bOSNQMhCyAH83CuzRw= =MpjC -----END PGP SIGNATURE-----

[PATCH] Get "hg serve" to print the URL being served -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Get "hg serve" to print the URL being served From: Bryan O'Sullivan <bos@serpentine.com> If invoked with verbosity, print the URL at which we are serving. Useful if you bind to any port with "-p 0", and need to know what port the server is listening on. manifest hash: d317225606fbd2ec5819e1f266575b0485dfba79 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCyL9hywK+sNU5EO8RAjFQAJoDBRl5VoGIklxA1PdFGCt8Jb3iMQCeILeD XAwnnSCy/IQ/MDfYf6z7oWI= =FNVC -----END PGP SIGNATURE-----

Various HTML cleanups -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Various HTML cleanups From: Edouard Gomez <ed.gomez@free.fr> Cleaned up the changeset summary table differentiating title cells from data cells using th and td. Added semantic classes. Changed the big pre tag into a div that mimics pre tag style (that is monospace font and white space preformated). This is required because pre is an inline element, and thus cannot be the parent of block elements as div (diffblock). I replaced all these div blocks by a series ul lists as patches can be seen as lists of changes in versioned files. If someone has a better semantic to propose, i'd be pleased he drops me an email about this patch. - -- Cleaned up the filediff summary table differentiating title cells from data cells using th and td. Added semantic classes. - -- Keep style unchanged for changeset template As promised no changes in style. This one got through my eyes + brain checking... sorry. manifest hash: 68dd5c1ac71aa6a5932fb209d48df5fc0c78643b -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCyLwfywK+sNU5EO8RAtE9AJ0cxl80eF3zpBWLn8OkoSs7dkZOTgCgtYto j7T/iRk0Hq4Q0mjdos7FvYU= =KOP2 -----END PGP SIGNATURE-----

Add globals to templater/fixup RSS -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add globals to templater/fixup RSS This removes a bunch of duplicate header() and footer() bits and makes url and reponame available to all templates. Fix up RSS bits to use url Fix strftime call manifest hash: 63e616e4c7f517a630d80429336817d64e900b68 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCyLlRywK+sNU5EO8RAj9IAJkBDzMQaOwRmF0q8tRmVRnzHCjShACfSTCj dbfAWg1crv/mUuRZlWL6Tc4= =Z331 -----END PGP SIGNATURE-----

Simplify RSS date generation -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Simplify RSS date generation manifest hash: 3b1628aaee450c292949f6d079b4a05ccb5ce6ab -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCyLatywK+sNU5EO8RAiLMAKCqYFyzSDCU6Wm34LSWZroAHMqa4QCfSWv6 jh/vvuQS0qmXybm6Ivd7XVY= =x1Rf -----END PGP SIGNATURE-----

[PATCH] Add RSS support to hgweb -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Add RSS support to hgweb From: Goffredo Baroncelli <kreijack@libero.it> with the two small patches below, now hgweb can act as feed source. Two kinds ofobjects can be tracked: the changelong and the files. This can be useful if anyone would track the changes of a file ( and because git has it, mercurial have to has ). To check the changelog the url is http://127.0.0.1:8000/pippo.pluto?cmd=changelog;style=rss To check a file ( the mercurial/hgweb.py for examples ) the url is http://127.0.0.1:8000/?cmd=filelog;file=mercurial/hgweb.py;filenode=0;style=rss The first patch adds a new filter for the template: the filter is named rfc822date, and translates the date from the touple format to a rfc822 style date. The second patch adds the templates needed to create the rss pages. Tested with akgregator ( kde ). [tweaked by mpm: add Content-type: text/xml add support for URL to header() add header with link and content type add RSS links on the normal pages] manifest hash: 170c03d50490d7160097f59abdde1a5073d2ba82 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCyFmLywK+sNU5EO8RApkrAKCYF/vZ3DwdMXPBds2LxGEX8+tK5QCfTeOc ZhPN8Xjt2cD3wMbNXMcoNSo= =COlM -----END PGP SIGNATURE-----

[PATCH 4/5]: cleaning the template parent management in hgweb -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH 4/5]: cleaning the template parent management in hgweb From: Goffredo Baroncelli <kreijack@libero.it> Now the patch remove every use of the tag p1/p2/p1rev/p2rev from the code ( even+the ones not used ), replacing everywhere with the tag parent ( even where the previous +tag are not use ), so the information to the templates is still given. manifest hash: ede1f299e9201fdad2ecf48e63314350acbb047e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCyEqxywK+sNU5EO8RAjc5AJ9o8AU6/YRuERblO/0kgWwDN4rqQQCgkVj/ UBtzW5x0yD65mK6rb4f+bQk= =07yG -----END PGP SIGNATURE-----

[PATCH] use <arpa/inet.h> instead of <netinet/in.h> for ntohl/htonl -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] use <arpa/inet.h> instead of <netinet/in.h> for ntohl/htonl From: Jed Davis <jdev@panix.com> This fixes the Mac OS X build problem; hopefully it won't break any other OSes, especially since SUSv3 says arpa/inet is the right header. ( http://www.opengroup.org/onlinepubs/009695399/functions/ntohl.html ) manifest hash: 2f06ff0cffefdb35e794131afcd1f34f9fdfa5cf -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCyEoFywK+sNU5EO8RAk6WAJ9v/pnr07zUXKM9EBQQGaKSZAlhxACdHrwS XTLSL6pPGAwaRfExGF2A3DQ= =Rtv9 -----END PGP SIGNATURE-----

A bunch of parsing/help updates -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 A bunch of parsing/help updates more explanation of how to get non-basic commands shorten names of debug functions and add docstrings add undo long docstring promote anotate, export, and revert make the global opts array global refactor parsing kill two unused arguments to fancyopts update test-help manifest hash: 459ae2273aaf54f71b4576677a681dc53ab2908c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCyEDhywK+sNU5EO8RAr0DAJ9LTu8Fc2quLRtuwLPTQzWqlOJWKwCbBpZk pnMkYnshsutVYljcil1P46I= =Sleg -----END PGP SIGNATURE-----

Expand undo docs -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Expand undo docs manifest hash: 4381a35ef96ce10176dde3c9c6c2503f65ae8a09 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCyD93ywK+sNU5EO8RAianAJ97+hYOTwV3OvAAekcYn3f1Ahzf4ACeLjgz kUAHrjSmhs2F421lXxbgCfw= =gbg9 -----END PGP SIGNATURE-----

Update CONTRIBUTORS -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Update CONTRIBUTORS manifest hash: 71ba14cae4b50532d09de7ca49bc67375a69161d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCyD9kywK+sNU5EO8RAqbuAKCeP12TfqkADk+xAKy04U78TmHJKgCfeZIg qPwEtFA8Qd0l96fjJmL+peM= =f6lv -----END PGP SIGNATURE-----

Shorten help -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Shorten help Basic commands are now marked with "^" in the table only basic commands are show in hg help by default copyright banner not displayed with help by default manifest hash: 7337678588354ca669a3b13d1fbb0ad893563947 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCx9LNywK+sNU5EO8RAokCAJ9ZK2sGEto9RLyukFX+n0nzHRoB9QCfU84I e+Evc2g91kSS92FPrIC+Hnw= =yUmt -----END PGP SIGNATURE-----

Restructure option handling -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Restructure option handling This allows global options to appear before or after the command name Also includes a patch from Andrew Thompson <andrewkt@aktzero.com> to catch invalid global options. manifest hash: 2a1285c0caf04ae79dca10cb899d183d84a6f3d4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCx80cywK+sNU5EO8RApJSAJ9U6ijOIbMDAd4lcahY6dXCTPcsNACeKuNT iVhCp9IvacwwuHjAFXsLJEQ= =Q9Qe -----END PGP SIGNATURE-----

options: kill -d for debug -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 options: kill -d for debug You must now use --debug. This is a preparatory step for changing the option parsing from: hg [global-opts] <command> [command-opts] to hg [global-opts] <command> [global or command opts] manifest hash: ec5ecc687340baa109a98b742f1cd8d1f4aadeed -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCx4urywK+sNU5EO8RAl90AJ0fwKU/GwHpJvlTFl5naeJbkceWewCgh4jK kaTSSodACgPzgbFiid5RL4Y= =siEe -----END PGP SIGNATURE-----

hg revert should revert to parent, not to tip -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg revert should revert to parent, not to tip manifest hash: b6b622d0316f9f7ef60e500fb73844a4b0ad7b69 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCx27VywK+sNU5EO8RAnpHAKC1H3GAPC5wYlgpJG7Z7rWPl+vblQCeKVsz UCjkaDw40evLbltWoY24xQs= =dmvS -----END PGP SIGNATURE-----

[PATCH] bring MANIFEST.in up to date -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] bring MANIFEST.in up to date From: Andrew Thompson <andrewkt@aktzero.com> Some files were not coming over when I did python setup.py sdist I included MANIFEST.in for completeness, but I'm not sure if it should be in there. manifest hash: 9e055bea2829035685f8a4a9aaf07ee3f9785e1d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCx2I7ywK+sNU5EO8RAl0EAJ9hwuKskuBwcSM46hqZY30JkMq8swCgnQVI 9FeppaKIUC3z2YMzhFHxRUQ= =3xJV -----END PGP SIGNATURE-----

[PATCH] hg revert -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] hg revert From: Bryan O'Sullivan <bos@serpentine.com> Add revert command. manifest hash: 0094e6bf421f34bd0492a33f95400b1b095a6bdc -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCx2BaywK+sNU5EO8RAigMAKCrvgTtIDuirCsMVlbiTMqaJy3UNgCdEcTL hMN1X8FZi6sH+NjUdr9sYBg= =i58L -----END PGP SIGNATURE-----

TODO tidy -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 TODO tidy manifest hash: 04cb69f34ab0725c56abe8f26c3c3df240cc6569 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCx18jywK+sNU5EO8RAiVpAJsHdJ5aBd7K1l3mI4cK/wjJ7JC1CgCfUpMS SY4h+IVdtWbH27Ra0DaT27w= =XF3q -----END PGP SIGNATURE-----

[PATCH] Tags template cleanup -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Tags template cleanup From: Edouard Gomez <edouard.gomez@gmail.com> Tags template cleanup This page lists all tags, thus using divs doesn't structure well the information. Better use a list (ul). Each tag becomes a li element. The li element also carries the parity information. As font style tags are highly deprecated in newer HTML variants get rid of the tt element, relaced by a simple span that gets a CSS class that mimics tt default style (monospaced text) Added CSS classes required to match old style. manifest hash: f8943b8270e20966a04111e7205deefedd8b7075 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCx1ijywK+sNU5EO8RAjaAAJoCVaD37YUC6DueL6Kd5D9aoCF8bQCfSWw0 xFVkpEtnr6ST4eyJjR8K17U= =nphb -----END PGP SIGNATURE-----

[PATCH] Changelogentry template cleanup -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Changelogentry template cleanup From: Edouard Gomez <edouard.gomez@gmail.com> Changelogentry template cleanup Removed unuseful outside div (was probably used to carry the parity class, it's no use, multiple css classes can be assigned to the inner table instead) Removed all hardwired styles in html tags. The style has been externalized to equivalent CSS classes. The inner table is now assigned the parity CSS class. Changed all relevant table cells from td to th. Added classes to all cells in order to give some semantic rationale to these table cells. manifest hash: 2835217df09be445961b865be166c2470173ba58 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCx1g5ywK+sNU5EO8RAhKGAKCWAHrx+lLMAXjd4/vgvG7vmfSkAACfTZ+m /EyUsDVaYeVcGzFsp8liReI= =vt2N -----END PGP SIGNATURE-----

[PATCH 2] ChangeLog template conformance fixes. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH 2] ChangeLog template conformance fixes. From: Edouard Gomez <edouard.gomez@gmail.com> # HG changeset patch # User ed.gomez@free.fr # Node ID e0661b00c613fa2bf1b670db1c9097423b4a107f # Parent b2e9146c237d84a1dd24af9a08bfb031bcc3a523 ChangeLog template conformance fixes. As per: http://www.w3.org/TR/html401/interact/forms.html#h-17.3 form element MUST have action attribute As per: http://www.w3.org/TR/html401/interact/forms.html#h-17.4 input has no length attribute, replace by size (i don't couple this with maxlength because a tag may be used in future versions and no length limit might be required ?). manifest hash: c8dccb4805167a47f159094fc5f57500caec4951 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCx1fdywK+sNU5EO8RAliGAJ4iBaSn2D9rRXVmreEYUwNvDyxMlQCeLxMU HcVHU0wRJDAbiXngOINk7GA= =FyPC -----END PGP SIGNATURE-----

[PATCH] Hide style from non conformant agents -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Hide style from non conformant agents From: Edouard Gomez <edouard.gomez@gmail.com> Hide style from non conformant agents manifest hash: a5bab168fece5c570b84987faee8eed944ce3fab -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCx1cWywK+sNU5EO8RAm9LAKCcVq6I71gE+SR97ebX4hgm3+1L6QCgtUF6 qWADsVpZhU5xVipYn0SpE9Y= =btY1 -----END PGP SIGNATURE-----

Remove all remaining print statements -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Remove all remaining print statements Convert most prints to ui.warn or ui.write Pass a write function into transactions manifest hash: d1b0af7a344fc087a5acfe3ae87b782c20d043e0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCx1Q3ywK+sNU5EO8RAqSTAJwM5t/m+JOlf2ZXOjuItCSdFiubcwCdFm3G HoicikSYpTgfCj2pIRfyLjo= =Loqo -----END PGP SIGNATURE-----

Fix up test-help for export -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix up test-help for export manifest hash: a178ced2f645770d11c88261489dd8e8d876d94c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCx03xywK+sNU5EO8RAs1sAKCNgjEvBkGKaLi//pRy+NyNoDYKgQCghd6F RA+ydCpNoC9k2fvge29c8fc= =DoKn -----END PGP SIGNATURE-----

[PATCH] New export patch -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] New export patch From: Bryan O'Sullivan <bos@serpentine.com> Modify export command to accept rev ranges and output file spec. It can now export a range of revisions, and print exported patches to files whose names are generated using format strings. manifest hash: e0085c205cdc31a168bcd25c85772ef00d53031d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCx02iywK+sNU5EO8RAtCKAJ0V2K9+i1OGa27KyC5/nq3m+OdvtgCgpnav 3vfEODMzJVOZoJt9wzI1UCg= =YAdI -----END PGP SIGNATURE-----

Actually warn on pulling from an unrelated repository -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Actually warn on pulling from an unrelated repository add some comments to findincoming track the base nodes of the fetch set report if the base set only contains nullid add a test case manifest hash: 3fc038a6041b0967a20503f5ec8876efc038841a -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCx0yLywK+sNU5EO8RAlK6AJ9J/GKPpYSMzTqmguXPWOISJ+zY5gCghd+j ClLpn0dKZnB46dh0F8zhuuk= =emNb -----END PGP SIGNATURE-----

Remove empty directories on update -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Remove empty directories on update manifest hash: 113969ec14c75eb9e1013b23cf096f722932b84d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxyVoywK+sNU5EO8RAklKAKCzSUhuFClkHN85qlnDp5iVscZbtgCeJVwx dqaqG20GjPMWBg0d1ggI/ro= =o2Uv -----END PGP SIGNATURE-----

Remove -p global switch in preparation for combining namespaces -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Remove -p global switch in preparation for combining namespaces manifest hash: 88b5d17097aababa5c2c9242deba51598b207e3c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxyR/ywK+sNU5EO8RAvPbAJ0XtMA5E1y71hrx9ahBxU3sys98LwCghnz/ xks9tYPTnG8aizwEmg68EGw= =5MkD -----END PGP SIGNATURE-----

Handle unknown files better on update -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Handle unknown files better on update If we spot an unknown file that's identical to one that's in the update, we get the updated one so that it shows up in the dirstate properly. manifest hash: 988aca64f255df67c27d1c6f8694ea098e4ec159 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxyFyywK+sNU5EO8RAjmiAKCTgINXMPB1CxHt0OgHYPucfjCS7QCcDpJJ VgKqZS54hTAWN3jL2yllUhI= =iPQD -----END PGP SIGNATURE-----

More whitespace cleanups -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 More whitespace cleanups manifest hash: 6721a7b11295e0127386b080fd7a7b516ebced74 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxwm/ywK+sNU5EO8RAnl+AKCg/7ZCW7zIoG0nefksZzgLzgNmFACgnAFz ZkW0LyZcU/hkFgXoGwo7ktk= =AW+0 -----END PGP SIGNATURE-----

Update test-diffdir output -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Update test-diffdir output manifest hash: cd0fb3a3708897fe959852c48de1804fb0b74bf4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxwmcywK+sNU5EO8RAlRCAJ9SBrMQLSRVY1j3V1YO25dGbIN18QCfTbHJ 6/4+xEBX2j3VxUf1g3ayce8= =kcDR -----END PGP SIGNATURE-----

transaction: nullify journal after close() -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 transaction: nullify journal after close() This keeps us from trying to cleanup in __del__. bug spotted by K Thananchayan <thananck@yahoo.com> manifest hash: 1f4c5fa43d2458cdcb6ec0f0a7066b3c3e699f33 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxwQ6ywK+sNU5EO8RAuGhAJ9+BnKILwRCF9EKlPTz2zptiysQ/QCgsB3s VKIehiStv+ibWQQi15k4mwk= =nZD1 -----END PGP SIGNATURE-----

[PATCH 5/5]: cleaning the template parent management in hgweb -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH 5/5]: cleaning the template parent management in hgweb From: Goffredo Baroncelli <kreijack@libero.it> remove the unused function hgweb.parent() manifest hash: cd5a8812bc0ecbefb2e9e007f6e2bad12cd9e485 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxv0BywK+sNU5EO8RAtw8AJ4ttjQzg2ZT+17r054Uaidvn34ruwCgtTDt Gcr7hR1VvMyFC70IWBdXIpE= =oKEL -----END PGP SIGNATURE-----

[PATCH 3/5]: cleaning the template parent management in hgweb -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH 3/5]: cleaning the template parent management in hgweb From: Goffredo Baroncelli <kreijack@libero.it> the filediff template use the old style p1/p2 and p1rev/p2rev inteface; the patch removes this old stuff, and update the code to the new style manifest hash: 29536b6ee71f03a48bceb7336040070ecd0d2b9e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxvplywK+sNU5EO8RApW4AKCrTLHofr8jELtvNRpoNJHc0sjEfgCfaY2q /H96T6BMMXA4VLFVxzOBHCo= =u4El -----END PGP SIGNATURE-----

[PATCH 2/5]: cleaning the template parent management in hgweb -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH 2/5]: cleaning the template parent management in hgweb From: Goffredo Baroncelli <kreijack@libero.it> hgweb: rename #parent1# and #parent2# to #parent# in the template managment manifest hash: c7da29f029a1c875127989bb6635007a90f8f59c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxvmkywK+sNU5EO8RAnREAKCXuVAU054xkYsfQLug3y/u4tpGxQCfdnKA QkX42FSUBN1EwFyzrzC6vs0= =o8VK -----END PGP SIGNATURE-----

[PATCH 1/5]: cleaning the template parent management in hgweb -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH 1/5]: cleaning the template parent management in hgweb From: Goffredo Baroncelli <kreijack@libero.it> the template pages contain two entry named #parent1# and #parent2#; this is no +good because with the template system implemented in hgweb both the functions can be replaced with only one entry named "#parent#". The code in hgweb will replace this tag with the appropriate number of parents (+one, two... or more if and when will be used ). The first two patch perform this change in two step: 1) change the code to manage only one entry ( #parent1# ) 2) remove any reference to #parent2#, and change both the code and the templates to rename #parent1# in #parent2# the last three patchs are clean-up. The patch are five - - patch #1: - - clean the code in order to ignore #parent2# and use only #parent1# hgweb: chanage the parent1/parent2 code managment manifest hash: 6ba707904edf176c7269f2d9b80502902e6934c6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxvivywK+sNU5EO8RAkotAJ4vbR0KE+Jem20rQbaJxy8NRFeyJgCdHy2M hxmeD9erv17BrSKLGd5QAQI= =Or/F -----END PGP SIGNATURE-----

[PATCH] Add tags to hgweb -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Add tags to hgweb From: Goffredo Baroncelli <kreijack@libero.it> manifest hash: 3a59c363799c974b042dbb55f943d830feb1b34f -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxcfHywK+sNU5EO8RAgEKAJ40SRMOyBOkbS8QU2MIBUzBnhu5AwCbBDjR M+gaWyqzqOBzO1r+9zpb37k= =l1pL -----END PGP SIGNATURE-----

Add parent revision numbers back to hgweb -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add parent revision numbers back to hgweb From: Goffredo Baroncelli <kreijack@libero.it> manifest hash: 9f81492df935e94e7c544b071aa9caac3b102190 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxccYywK+sNU5EO8RAkW7AJ9aXTUZ9JnbZMrxCrcuXozYzkdw/gCfT8IO qnqe966Mvapr2jULeXldQW4= =XiV5 -----END PGP SIGNATURE-----

repo.changes: fix duplicate changes -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 repo.changes: fix duplicate changes We need to discard the changed and added lists from dirstate.changes before adding to them when comparing manifests. Otherwise something that changed from rev->parent->working dir will appear twice. Bug spotted by Goffredo Baroncelli <kreijack@libero.it> manifest hash: 64c335e2fe6df6d1ce29d0903f16821c7566768f -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxcT3ywK+sNU5EO8RAivLAJ4gqbWfMnt+BdyGac/ZGduy2KbNegCgncPV D4ay6Qw9sIodEPjRebvk3GE= =AZd2 -----END PGP SIGNATURE-----

[PATCH] Make ui.warn write to stderr -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Make ui.warn write to stderr From: Bryan O'Sullivan <bos@serpentine.com> > Someone is probably using ui.write instead of ui.warn. Actually, ui.warn uses ui.write. So hg never prints to stderr right now. Here's a patch to fix that. [mpm: add sys.stdout.flush()] manifest hash: c09c645a5985b640a7ad884afb0eeb11fcffbb19 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxcEaywK+sNU5EO8RAhWUAJ9vVteAodKC9zIhIWUuPqVl2d915QCePp5S asuv62w4Zv+o0gB3SoucYdQ= =NYrs -----END PGP SIGNATURE-----

[PATCH] Add contrib/buildrpm script -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Add contrib/buildrpm script From: Bryan O'Sullivan <bos@serpentine.com> Just run "buildrpm", and it builds an RPM for you. No funky monkey business required. manifest hash: b8fde5108b5cc8f49ce248d14ac2ee7ad004c91c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxb6sywK+sNU5EO8RApQZAJ94VD6NQr9l4Xx6w3S8EdpCIUuiIACfdoHA qnQWtMM+kqAzi3LnO92UYWE= =SWIO -----END PGP SIGNATURE-----

[PATCH] clean up RPM spec file -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] clean up RPM spec file From: Bryan O'Sullivan <bos@serpentine.com> The current RPM spec file makes it impossible to split Mercurial into multiple interdependent packages. Here's a patch that fixes that problem. manifest hash: 4acc4c5cf4485d92a32d2259b83314b7167dece3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxb2+ywK+sNU5EO8RAnrTAJ4tkAh6xnHvRHMxzrfqKb/SXYS2wwCeMfK1 PAr+1FFoSqUmA9rt8Yaw6f4= =MaPn -----END PGP SIGNATURE-----

hg clone: only use the absolute path for .hg/hgrc -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg clone: only use the absolute path for .hg/hgrc manifest hash: 7fb6a265249a3c910c0321eb1efc61c38429ac91 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxZ5mywK+sNU5EO8RApIwAJwKdex+GwoflS8vKY9h7qA1F4/Z8wCgjkWH VsKsuPsM97sluArdDZLZsbs= =0g6X -----END PGP SIGNATURE-----

Fix dodiff/changes -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix dodiff/changes dodiff was failing to pass both nodes to changes changes was comparing things backwards, resulting in added/deleted confusion in dodiff changes was deleting things from cached manifests, use copy() changes now sorts output lists manifest hash: 6ad972b0895b9d855e246efef49c2ebd943946b3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxZhZywK+sNU5EO8RApZWAJ9mYv1zc7IjXPIMwbVsfroQs8jfBACgn7R7 rTqLTTyIkM1OpL/ebnMtCOY= =VcIr -----END PGP SIGNATURE-----

fancyopts: drop unneeded import -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 fancyopts: drop unneeded import manifest hash: 09729db8a301510f021fd84a9e82a16ea3ccc67b -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxZegywK+sNU5EO8RAnJwAKCn8kw2VzLc1NgObPFyYI1NxtBJSACgk1v4 d041JB9E0PybyftBFV55Of0= =Cp7N -----END PGP SIGNATURE-----

[PATCH] hg clone stored path fix -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] hg clone stored path fix there is a small problem with hg version f6c6fa15ff70+20050701. when i clone a repository (on my local system), the path of "parent" repo stored in the clone repo is not correct. here is more details -- i clone a repo named "xen-today" with: hg clone xen-today/ test4 then file "test4/.hg/hgrc" contains: [paths] default = /home/aq/projects/hg-xen/xen-today Signed-off-by: Nguyen Anh Quynh <aquynh@gmail.com> manifest hash: 6ec2f059907fd5544e40c9e78284271d52eeb23f -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxXeyywK+sNU5EO8RAru1AKCVeqGqLrbLn8Zonr683jNlVx+FoACdHoll B2+uEV33zpxWUj7fcntYJVk= =SB49 -----END PGP SIGNATURE-----

transaction: __del__ should do nothing if the journal already exists -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 transaction: __del__ should do nothing if the journal already exists manifest hash: c85f747ca762b7c446d306cbd7a20f8e566557fb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxXbTywK+sNU5EO8RAvjsAKCcTSzN9OjtoAdaZgtjDs9380ia7ACfcXsx FcNESqr4nX9b97WTGszJs48= =C2sL -----END PGP SIGNATURE-----

recover: the journal is named 'journal' -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 recover: the journal is named 'journal' spotted by K Thananchayan <thananck@yahoo.com> manifest hash: a2ecfedb3d58011cdf5ef7741ff61aba15aa5885 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxXVbywK+sNU5EO8RAmiBAKCgULQVAZ42xuPRyzb3Rrk794LtaACgoLdF TNtgK/MqF6+EjWNJ5mm2geE= =m5U3 -----END PGP SIGNATURE-----

Move dirstate.uniq to util.unique -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Move dirstate.uniq to util.unique manifest hash: 8ac613c30a4471f14ae52f14ed0839d66eeaebb7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxQAqywK+sNU5EO8RAsTiAJ9E9/cALe+W8ojtfVdiXXre5dB/9gCeOgxr mRnVw/WDplkATW5450Pgsug= =xSfl -----END PGP SIGNATURE-----

Unbreak dirstate debug commands -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Unbreak dirstate debug commands manifest hash: 0a4081443c954d278062dbfbc205119eab350191 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxQAJywK+sNU5EO8RAoIvAJ4wYqOWdVtzEL0BClN0+pLNghyS0ACggwmG 05MpMLTY6+VSueiHMwre+UE= =zo+4 -----END PGP SIGNATURE-----

Fix some linewrapping -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix some linewrapping manifest hash: 3be515e65adeb9652e646059fb6dc8d23b0a7a72 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxP0dywK+sNU5EO8RAoSCAJ9kOtNnkesCD/QplxujNJxvb8JJowCeJb0Q q58TYLTbZ8wnuFwagBABVds= =CN45 -----END PGP SIGNATURE-----

Merge with TAH -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Merge with TAH manifest hash: b8ea5be49794773eeb6b8beb712a7c1bd9ed1e9b -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxPqMywK+sNU5EO8RAn62AJ9nmqCKGck8T4E90V+jljRV56hcHwCff0Co jTfrJT1oJrGRgd6VE/B4hKc= =8nW7 -----END PGP SIGNATURE-----

Allow specifying revisions in 'hg log' like with 'hg diff'. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Allow specifying revisions in 'hg log' like with 'hg diff'. manifest hash: 62d48dbaa0213b36f08dc15bc3b1a1f35ecd89f0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCxPbeW7P1GVgWeRoRApOgAJsFYCQ8EEpYDQz8t53bRXfrP/MXwwCfWDV5 dLv6zwG6/I++SyChFkTPfAY= =cg0V -----END PGP SIGNATURE-----

[PATCH] bdiff/mpatch under MSVC -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] bdiff/mpatch under MSVC From: K Thananchayan <thananck@yahoo.com> MSVC (6.0) environment does not have 'stdint.h' and does not provide `inline' qualifier. The following patch is needed to make mecurial installable under MSVC. manifest hash: a5b64235acced16cb451faa698922559fec4e573 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxPapywK+sNU5EO8RAmRnAKCt9cOASaIsYB6kNUDSIStR1DmY4gCgnXlL Jf0nMmGEkoyXtB0eV+fLzJU= =fKD5 -----END PGP SIGNATURE-----

[PATCH] Tests for clone command -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Tests for clone command From: Bryan O'Sullivan <bos@serpentine.com> This patch adds two new tests. One tests clone's correct operation, the other that clone fails when it should. This patch depends on oserror.patch. manifest hash: a0c9c4932baf29e7b33b2bd2003ddd2254ce65d3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxPX9ywK+sNU5EO8RAmSNAJ9esixtATdkszwLltu65dzpKf6P4gCcCqGT +Z7CTbXRTFcJvmXFlvEo0xE= =6fqz -----END PGP SIGNATURE-----

[PATCH] Catch OSError usefully -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Catch OSError usefully From: Bryan O'Sullivan <bos@serpentine.com> This is a rewrite of an earlier clone cleanup patch. Catches OSError properly. manifest hash: b1faf01867195a992a9ada0edb2095f85ab3e68f -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxPSnywK+sNU5EO8RAmX4AJ9KG8MFZc7B79ZW22Qd7aQ4KyxUHwCgnkJz Mj0FkpW+uccoSqKc2pxxv5k= =LW+l -----END PGP SIGNATURE-----

Fix braindamage in repo.changes -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix braindamage in repo.changes manifest hash: d34a5d36fde0ecb444ea3a5b156bea0bff51554d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxPRxywK+sNU5EO8RAh/vAJ0buHjZ7w4Y2I6l9FnHl0prmTURrgCbBqOU cJ6wUXXPaRmQJS4ECFPCZcE= =WMC4 -----END PGP SIGNATURE-----

Merge with TAH -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Merge with TAH manifest hash: 1742d7ba2093dc643b57e45167cb2d794212cbb9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxPCQywK+sNU5EO8RAkr0AJ9qut/31lCLQ/xY3FWaF3c21RhS7wCfW1eV 3WexPDsJldMAr3V5vc9eowA= =pJYu -----END PGP SIGNATURE-----

Add an empty line after description in verbose mode of show_changeset. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add an empty line after description in verbose mode of show_changeset. This makes it a little bit easier to see where a new changeset starts. manifest hash: dd0dc3a135ca2fabed03b86116863c93a451670d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCxOVgW7P1GVgWeRoRAjtdAJ9B/ECd/Rhws2Bd+IcwRyqcYEN0ugCfbug2 Uhy2yUhV+mlrqFkoNBkcOmM= =ttyp -----END PGP SIGNATURE-----

Work-around failing tests/test-bad-pull with slow bg process. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Work-around failing tests/test-bad-pull with slow bg process. Without the 'sleep 2' python dumb.py often appeared after hg clone. manifest hash: b32381ac46a7691f2a92595b650b2406853644c2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCxOM+W7P1GVgWeRoRAjgTAJ9OqrikdK043Eiyyx9dG8DR1XZ7tgCggdmM AVYvAZO3P+WlaWDu3MaxEXY= =0XN5 -----END PGP SIGNATURE-----

Remove bashisms and use /bin/sh instead of /bin/bash. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Remove bashisms and use /bin/sh instead of /bin/bash. manifest hash: 25560e04ff8ac33a6d8b82d2328b4e90578bee4c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCxOEjW7P1GVgWeRoRAm9XAJ9IjlbMerPYEhKQQu7Ufcm6630cDwCfdXJ3 865XH6YVMuCYNjf3eibwQaM= =r3gh -----END PGP SIGNATURE-----

Updated TODO -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Updated TODO manifest hash: 007f50cbf11632362229853439d2610a1ad3f989 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCxF+7W7P1GVgWeRoRAg8MAJ9k3HXkpmHk3SRYw9FiqfHh8sEDFQCfc5il 2T+hyWgBwBTTHYpBeujq/20= =cRVv -----END PGP SIGNATURE-----

Merge with upstream -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Merge with upstream manifest hash: 78c3657547aa957be685a4d54462570eb4b5e181 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCxFpbW7P1GVgWeRoRAqWGAKCkLQPbZpdLCBWKD+pecMtTRiu9EACfbuz4 dtHuM/86dYZ6CRqQHohJVjk= =v+Vv -----END PGP SIGNATURE-----

Added support for hg:// and old-http:// to 'hg clone'. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Added support for hg:// and old-http:// to 'hg clone'. manifest hash: 4292cc7927afbec5663b5fff4317a238fb65cdec -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCw44lW7P1GVgWeRoRArWzAJ9AjiCF7poldqFxshV+lAyHZKy2PACgpCt1 KTdmdp+AL6m953NnYc5QNbo= =BWbr -----END PGP SIGNATURE-----

TODO tweaks -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 TODO tweaks manifest hash: 7b4c0443e17f1d848b7b7c9fe62407bf80c0a874 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxO9gywK+sNU5EO8RAisZAJwJPvdoKuL12u+C0+RLD7A+coQrIgCgsiNQ +Kml7VZ5cyCaZNCGgFYSemg= =hIqs -----END PGP SIGNATURE-----

Minor hgweb fixup for new diff code -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Minor hgweb fixup for new diff code manifest hash: a80a817fa1511c6ea76f07b2e03691539c19de55 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxO7lywK+sNU5EO8RArAkAJ49Piw1lKwhno5XtTdE0J2B3KIeJQCgpeZW JbFuy/zzo2e45xu6Uez8CMw= =sQOB -----END PGP SIGNATURE-----

Add multiple keyword search to hgweb -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add multiple keyword search to hgweb People kept pestering me about this one. Now it's done. If you type a tag/id/rev in the search box, it takes you to that entry in the changelog. If you type some other random keywords, it does a case-insensitive search through the history and returns the most recent N items. It's not super-fast, but it's serviceable. manifest hash: e8fa980dee92cf78c04051d3028da9b07a45f3de -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxO6JywK+sNU5EO8RArAwAKCq+9qO/OL0mQxa1J7C77Z6AcZoWgCfbiDC AZ5KllldwBtdRRREn7HH6go= =sIy0 -----END PGP SIGNATURE-----

Propagate file list through dodiff -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Propagate file list through dodiff This speeds up operations like 'hg diff Makefile'. Previously it would walk the entire directory tree looking for changes. Now it will only stat Makefile. Further, if Makefile appears untouched, it will skip reading the manifest. manifest hash: ab22a70a5511ed2d7a647f2cd15d129a88dccabf -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxNRyywK+sNU5EO8RAgb6AKC2TzWmRjNsWq0Q9Pa+ppCZ6Y+pdwCfdHUA UHu024/2Wt6C6WZ5vcWfPbo= =E35L -----END PGP SIGNATURE-----

Refactor diffrevs/diffdir into changes -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Refactor diffrevs/diffdir into changes Add dirstate.changes to replace most of diffdir Add localrepository.changes to replace diffrevs/diffdir This code can now efficiently check for changes in single files, and often without consulting the manifest. This should eventually make 'hg diff Makefile' in a large project much faster. This also fixes a bug where 'hg diff -r tip' failed to account for files that had been added but not committed yet. manifest hash: 20fde5d4b4cee49a76bcfe50f2dacf58b1f2258b -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxMxpywK+sNU5EO8RAhzOAJ9VLQJoC+hiRYQtTSPbDhXBEJfQZwCgpDx9 GAwQ9jZHNsgXckBfXNCkJV8= =hMuc -----END PGP SIGNATURE-----

Deal with failed clone/transaction interaction -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Deal with failed clone/transaction interaction > What is happening is that something in the transaction machinery is > causing the directory to be completely recreated. The transaction gets rolled back by its destructor. This is critical so it happens whenever an exception occurs that unwinds the stack. Unfortunately, what's happening with clone is we're trying to delete the directory during exception propagation. And a reference to the transaction is held in the exception backtrace stack frames so it still exists until the exception is completely resolved. So there's no way to do the directory delete inside the exception handling cleanly. But we can handle it similarly to the transaction itself: use an object with a destructor. manifest hash: fc38550a20d64d08333f256bbedc312493c1390b -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxDT2ywK+sNU5EO8RAjikAJ0Tej56rAutxQDfYzVbFGtT1sEC5ACgmVds /fwdQyHn+FwshugqXLemUaM= =3f78 -----END PGP SIGNATURE-----

[PATCH] Handle 'name firstname <email@server>' correctly in annotate -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Handle 'name firstname <email@server>' correctly in annotate - From ed.gomez@free.fr manifest hash: 8af8d6b2afd8caf8e48e5150b91410dea730d41a -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxCpzywK+sNU5EO8RAj8tAJ9lIXS7tlgonp6B810QahCZM0NsigCdH8xQ cRhEGvrKDrTgc4AY9guylDU= =+sWJ -----END PGP SIGNATURE-----

[PATCH] Generate correctly XML entities for obfuscated user -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Generate correctly XML entities for obfuscated user From: Edouard Gomez <ed.gomez@free.fr> manifest hash: 8e4e2d087ff60020c948d34e724fca99c84a9115 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxCpDywK+sNU5EO8RAs6yAKCy97yrMO6VYlkRIF3diLoGClZSOgCfekPE ttPsLRoDTH12Tv6omFg6uUA= =8ZBC -----END PGP SIGNATURE-----

clone: abort on pre-existing destination directory -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 clone: abort on pre-existing destination directory manifest hash: c1c205ea212ed73521cebe0524da364f40ebf387 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxCIjywK+sNU5EO8RArteAKCM7oPK+htBvhz7n0Eo//A1BuGRQwCfY1xL 7denU7OqsKUf9UKKkhbWLB8= =rhfi -----END PGP SIGNATURE-----

Hashing speed-up -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hashing speed-up - From Chris Mason manifest hash: c10091676647015b907a3ddce4dc629cb485de36 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxCFmywK+sNU5EO8RAjiEAJ98eBaomWIUtT7DAm5dCbcAOe1I7gCdFl/E AvepXnn+tLC2Grk9et2sL3M= =spZz -----END PGP SIGNATURE-----

Add removing print to TODO -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add removing print to TODO manifest hash: 42be0c5bc52258bd3399f19257398f02af16c5ee -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCw41HywK+sNU5EO8RAvRIAKCd6o7sSJIXXMZa/i9o1CyIH0GhLgCePs5U 1BkkXUN2RcqfOpDqe6cUIW0= =aOPc -----END PGP SIGNATURE-----

Attempt to fix negative revision count from pull -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Attempt to fix negative revision count from pull manifest hash: 4e8881037d545f4bf76d2c1b06f685b2467cd3a8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCw4yUywK+sNU5EO8RApUkAKCCYTpBG3Wpu15aVeG0iBWE612S5wCgnSBi PEfXF4NI2O9AqWijOMBq6aM= =AyGw -----END PGP SIGNATURE-----

Fix clone bug wth trailing slash -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix clone bug wth trailing slash manifest hash: ca78730f00063c57b70db69cf9ecfc3f83c02e84 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCw4lNywK+sNU5EO8RApq+AJ9YTl92lLnk9UMvWWSeEue/siS6pACgsg68 FLAc0OVzeULP7ORKRHCtpQI= =IL3R -----END PGP SIGNATURE-----

[PATCH] Add --traceback option -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Add --traceback option From: Bryan O'Sullivan <bos@serpentine.com> Add --traceback option, to force printing tracebacks on top-level exceptions. manifest hash: 4347f42205b8b23835424b4e4100860ff2834b95 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwx7GywK+sNU5EO8RAgS8AKCmJAvTMGNJYYIW9eTI3RAqJZMfYACfS/rl Hn1Ukml5D1fdSvyehH2G080= =eLJO -----END PGP SIGNATURE-----

show connect message on push -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 show connect message on push manifest hash: 3edbff798a71719c91890b9ab5fda5c2bd64f256 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwx10ywK+sNU5EO8RAv0uAJsGMalwZ2aEElzZ8io5zlM/DjwqJACglVLb 7KXzzHdXfKGXOr00gUV4mvc= =sfeK -----END PGP SIGNATURE-----

[PATCH] Perform clone in place -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Perform clone in place From: Bryan O'Sullivan <bos@serpentine.com> This is a rewrite of one of my earlier clone cleanup patches. This patch only does one thing - make clone operate in place. It depends on safe-clone.patch. Don't have clone use os.chdir. Instead, do everything in place. manifest hash: cf7cf24f8fa1120b609b0beee4281bc236e484c0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwxxJywK+sNU5EO8RAjnlAJ44B1jhFvuYF3uNDH6qWDKaqgURuwCdFeFo Y9tjLx6TLCBWT146h21YEGA= =E1n/ -----END PGP SIGNATURE-----

Fix up test-bad-pull output -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix up test-bad-pull output manifest hash: 4ed6670e4f20a0ad9e5b483ccc3003e8bd5c094c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwxwdywK+sNU5EO8RAm4RAJ9MuISeQhLqfxo4/w3WLjk18y6gXwCeMwCf 4nvEMnJCPMyk4MSMfzPnCnQ= =wAOy -----END PGP SIGNATURE-----

[PATCH] Force "hg clone" to always create a new directory -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Force "hg clone" to always create a new directory From: Bryan O'Sullivan <bos@serpentine.com> I just screwed myself by typing "hg clone foo" without specifying a destination directory, and after I was done mopping up the mess, concluded that this is a dangerous mode of operation that has no practical value. I've thus modified the clone command so that it always creates a destination directory. If none is specified, the destination is taken as the basename of the source. hg clone foo -> error, because foo already exists hg clone http://www.selenic.com/hg -> new repo, named hg hg clone ../bar -> new repo, named bar manifest hash: f21ed8f805a60c1326d99220772e1574b0870d6c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwxsIywK+sNU5EO8RAgooAKC3IL6vKyADb9s2qqqi4GMw2Z7asACbBtE/ TvPgwGtIiB2GC+N+V7r1VpI= =uTcK -----END PGP SIGNATURE-----

Fix empty pull bug that appeared this morning -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix empty pull bug that appeared this morning manifest hash: 53e4709a701f03d9905933c80758ba13caf3998c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwxdJywK+sNU5EO8RAuoPAJ4tb9fd1Emm21/HLAEpyntaW2uoHQCfcc8z J8LB4mVG3gTsvRtiLZBVV/g= =+2C3 -----END PGP SIGNATURE-----

[PATCH] Fix use of util.CommandError -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Fix use of util.CommandError From: Bryan O'Sullivan <bos@serpentine.com> Fix CommandError so error messages don't say "abort: abort: ...". manifest hash: 2aea4c8043d321882dcdf846a42a55403ce1086f -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwvOZywK+sNU5EO8RAqF/AJ9IIr6JPPUc15tb7w4lnI7yMFxSmgCfQUYn OX7Uz7G3dJNRIjAxJtGwCLo= =xj/W -----END PGP SIGNATURE-----

Add some TODO items -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add some TODO items manifest hash: d188abf3c84b6ca98279b4bf053ce2844da83a03 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwvKyywK+sNU5EO8RAh9ZAJ9kYA0a/R7XynWqZGGr6JqUvXa37wCfd2a2 F9fCY85bSZgErvdrklP29bQ= =FtlU -----END PGP SIGNATURE-----

Add a CONTRIBUTORS file -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add a CONTRIBUTORS file Compiled by Rafael Villar Burke <pachi@mmn-arquitectos.com> manifest hash: 20acfff6abdd47408d8262d15b19099c33b85151 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwvDlywK+sNU5EO8RAuujAJ4wYp+deMoUO54W8qBAFXKY3IHGPACeJNpO x1rRm1amHz3V2RAfk/Rh9ZM= =8t0h -----END PGP SIGNATURE-----

Fix failed clone in current directory -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix failed clone in current directory Spotted by Edouard Gomez. manifest hash: 83fd3bb8056c531f2d696f00c5bd6a61274783eb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwu0jywK+sNU5EO8RAqPiAJ9tCL5PhHoGMTbaQzpt5dl+EkCH9QCgh4WL EOFeD2th0Ucs7Npu3t+VUB0= =p/Ig -----END PGP SIGNATURE-----

Add --repository option -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add --repository option From: Goffredo Baroncelli <kreijack@libero.it> manifest hash: 714316cb69ed5fcd981aa1bdb12de499e8348997 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwuyRywK+sNU5EO8RAmh7AKCtUxqC0KFcMYmoh/voLAbh6BncpwCgrL42 zzSMZAiUg4KEO9BxxlJOcDs= =eUcM -----END PGP SIGNATURE-----

Change getchangegroup to findincoming -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Change getchangegroup to findincoming manifest hash: 46dbdc025ead342f7c70a0051d1c596cfcbb6699 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwuwAywK+sNU5EO8RAoV/AJ9GaoLTKMo2aoycSIZyBt/8r073vQCeK/tO W1PwSot4HmnmcpR6RVIy9+0= =PiBt -----END PGP SIGNATURE-----

Whitespace cleanups -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Whitespace cleanups manifest hash: ac954bc3a4f034c12638a259ecd65841f5b63c5c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwuubywK+sNU5EO8RAluIAJ98XQpNdZUpSmYKgDmrMRlbL76ZzQCfes0t rknNUN/PhtyA4bzL646dOz4= =UyCE -----END PGP SIGNATURE-----

change unrelated repository error to a warning -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 change unrelated repository error to a warning manifest hash: 7c1481639c7e7ba91fd391a9fa6eb17e838f894e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwZ+xywK+sNU5EO8RAnnjAJ494NZfAdMVP48VegHQ+WeZ05DPogCbBEWC d3N47FYG87x1CJOh9VzwVCQ= =lrGp -----END PGP SIGNATURE-----

hg clone: don't try to delete "." -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg clone: don't try to delete "." manifest hash: 7e7bd5375f7729812b7188b7a53287b3c6049823 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwZvlywK+sNU5EO8RAjn6AKCaBNWdLSNXIDqQZ3vMcN5ie5ZZaQCfaG37 hAN32PbYoQh8UC88AeOKOk4= =kBOD -----END PGP SIGNATURE-----

Remove unnecessary deletion in hg clone -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Remove unnecessary deletion in hg clone manifest hash: 4a750332a8b1fe07b63f77ccede89d6486a478e9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwZpIywK+sNU5EO8RAq0IAKCsEtjbl9pe25FAkiDZo8+kAW8mpwCdGS7a JIMPHNUQeb552c4jaPjoyBs= =Jp3X -----END PGP SIGNATURE-----

Disallow merging of unrelated projects -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Disallow merging of unrelated projects manifest hash: 40badbca64e1ccfd83fee8cd7bf5099f57b6f8bf -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwZn6ywK+sNU5EO8RAmdeAJ9TAaGSe0nGMdL+Du3AGwm9x28IUgCgpfGG UunOBkobMVLGdHegnOvQkmQ= =VwVi -----END PGP SIGNATURE-----

More fiddling with uint32_t includes for extensions -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 More fiddling with uint32_t includes for extensions manifest hash: 1ad16a0262e9bd2769e32c13c7fd0c7b0cd7dde7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwS+/ywK+sNU5EO8RAhK1AKCtF/57nKCc1AU+l0sR74kHhY1NCwCfSvQK QQc5i8abuGkFpU5VUBJt5XQ= =H+CX -----END PGP SIGNATURE-----

[PATCH] replace history with log -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] replace history with log From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> Merge hg history into hg log leaving the first as an alias (tweaked by mpm: update docs, tests, use existing alias mechanism) manifest hash: f85001a4373b8b823a6221ba5c506628059d6779 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwSr1ywK+sNU5EO8RAmbAAJ9HlFkf8/qLOAQUtj8CWxGRPEyzVgCgtXwP SdnAg1a2q4693+TBiOjrimY= =w9rf -----END PGP SIGNATURE-----

[PATCH] Harden os.system -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Harden os.system From: Bryan O'Sullivan <bos@serpentine.com> Add util.system function. This is similar to os.system, but will either succeed (if the process finishes with a zero exit code) or raise a util.CommandError (if the process exits uncleanly or is killed by a signal). Add util.explain_exit function. This tends to be ubiquitous in code that calls other processes, and must describe what has gone wrong. Change some uses of os.system over to util.system. manifest hash: e3bf4adcac5b915432ec0af00efdbcef86bea4b1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwSipywK+sNU5EO8RAr0RAJkBDt8XQ7mYQAWNHNgTOVt1eyWU1QCfe1oO 2OwxyWqpbRNACVJHHfZ3/Xw= =OaRX -----END PGP SIGNATURE-----

README: mention lib64/ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 README: mention lib64/ manifest hash: 66865206771f64e1257235c8cf551edf77d2712c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwSemywK+sNU5EO8RAn/kAJ9NhZLCNdOI09rSL22p6zVsoMLyXACdGzVh 6hfXMuxEjn84xTLS4xJ2OLo= =VQie -----END PGP SIGNATURE-----

[PATCH] Add ui.expandpath command -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Add ui.expandpath command From: Bryan O'Sullivan <bos@serpentine.com> Add ui.expandpath function. manifest hash: dd2b9e536b94b453b06604b88ba339d93698b2e0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwSbMywK+sNU5EO8RAibuAJ9jAMqhR3cbTqbPG3g9M8INgFmbvACgjAU2 LpalLI+zhalEUIf1Uw8W5l8= =fqB8 -----END PGP SIGNATURE-----

[PATCH] Fix "no-update" option to clone -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Fix "no-update" option to clone From: Bryan O'Sullivan <bos@serpentine.com> Turn "no-update" (invalid Python identifier) into "noupdate". manifest hash: 1dfb3212b97531437d5a243813896c090a05d95a -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwST1ywK+sNU5EO8RAvGnAJ9/RvohYRxpMTWkK6YCiF6r3U68FACeNRcr mE/NYJzVbijiLK9TwWm8QgQ= =w/KV -----END PGP SIGNATURE-----

Use $USERNAME as a fallback for commit -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Use $USERNAME as a fallback for commit Suggested by Giuseppe Bilotta <bilotta78@hotpop.com> manifest hash: 3f86a63aebaf6c30eaa3a2081e1e5f9caa20caa1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwSPvywK+sNU5EO8RAqpYAKCmwfTfeNGCTqy2wuBs/bmtxMKt1ACeIpRo /vencPT6Z/WNXW+6p9NlZRY= =jFZ/ -----END PGP SIGNATURE-----

Fix troubles with clone and exception handling -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix troubles with clone and exception handling Clone deletes its directory on failure This was deleting the lockfile out from under the lock object before it got destroyed This patch shuts lock up and makes the cleanup code for clone a little cleaner. manifest hash: f666fddcf6f3a905020a091f5e9fd2cb5d806cdd -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwSGOywK+sNU5EO8RAkx2AKCIxPczl9YWnuUM+bMQnpVr8kv6uQCeNWld SUxSB99PGJHhq1LWFaSJJNw= =Frk/ -----END PGP SIGNATURE-----

Update undo test -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Update undo test manifest hash: b168c0b983b6aaeaf9cf4c74d65047eb4a5629f9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwSDBywK+sNU5EO8RAswoAKCb98RFAlTrEjsqGKhDX70m/CqriwCdGDOj LFlbZE+HoloZxTjXPaLpVmI= =dYu8 -----END PGP SIGNATURE-----

Better messages for rollback and undo -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Better messages for rollback and undo manifest hash: 22eeb8848b0e07e1f23a896b03c37f7d6f4bd82d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwSBtywK+sNU5EO8RAhNEAJ9MGJxgZjIKegh1TA7++wGbAzkovACgqL3I k1ii4X5PEWEDcoyOp0VqJn4= =wzlT -----END PGP SIGNATURE-----

[PATCH] Clean up destination directory if a clone fails. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Clean up destination directory if a clone fails. From: Bryan O'Sullivan <bos@serpentine.com> On Mon, 2005-06-27 at 16:27 +0800, Soh Tk-r28629 wrote: > Hg clone left the dest directory if the source isn't valid. > I think it should either validate the source before mkdir, or do a > rmdir to clean it up. Good suggestion, thanks. As validating the source in advance isn't really practical, I opted for the latter. manifest hash: 1508afddd2402142f9d8b2387652d4cb28ccc1f5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwRGPywK+sNU5EO8RApBOAJ9Fj22MP3pYJhxWsj8BYbcgWzIOKwCff9yC lX87RrDKicM1W61lBpQl20w= =efck -----END PGP SIGNATURE-----

Add exception class for repository errors -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add exception class for repository errors This gives friendlier errors for repo exceptions manifest hash: f3bef1ddb0c3911b9866ebdafa1fe72df48c8ecd -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwRCfywK+sNU5EO8RAg7fAJ9PMka8pJCy7mMTqFFJ5aQFemHpxwCfezPR cZRAXmbWTTI+/WnVFDjpfM0= =8crk -----END PGP SIGNATURE-----

Various doc clean-ups and spelling fixes -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Various doc clean-ups and spelling fixes manifest hash: 4115506709314aabfb4a66973ef2bc8f22f2225b -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwQ5YywK+sNU5EO8RAkAlAJoCsXCgEQ1lmS58aSrUyPf+KIK99gCeLY/v Tg9JhygJjwsu5xocc9Nh04Y= =JTG4 -----END PGP SIGNATURE-----

[PATCH] doc cleanups -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] doc cleanups From: Pachi <pachi@mmn-arquitectos.com> manifest hash: e6f721b21befe56fca36aac122b4e60755caafdb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwQMPywK+sNU5EO8RAsLuAJ0ezRwgJxAhTiC8S5svurQUvACYvQCcCCUS 1KjmG2VxQo2bgtu97I/AUEE= =bI7g -----END PGP SIGNATURE-----

[PATCH] simplify init -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] simplify init From: Bryan O'Sullivan <bos@serpentine.com> Remove source directory option from "hg init". manifest hash: 2ace7b16c962fb434340b937fbcd494f3098a85f -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwQG/ywK+sNU5EO8RArbCAJ9DG45GepMI0Z9KWXqV8gmEbV1WfwCgotih LGAkD8iTfOLn7HIPVqt9FWY= =65uW -----END PGP SIGNATURE-----

Pull from TAH -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Pull from TAH manifest hash: 08b55e07198b8a4272753895fe3727d9f52ebb75 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwO5YywK+sNU5EO8RArUtAJ9gsYYNbZH22COOz9B7ppwgCDxM8ACfYWcl n9Dim3Z7qepGUXvRDEeFZ9c= =JMQx -----END PGP SIGNATURE-----

Fixed test for previous change of 'hg -v history'. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fixed test for previous change of 'hg -v history'. manifest hash: 5a7d918645596751577b95d0dfba28fd70274b48 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCwOjDW7P1GVgWeRoRAvL7AJwO27B6qhOZZC+16SPjIxJBKz3BSwCghmkB OMzLY0CjZSHixF5xs0ZU6Dw= =F04F -----END PGP SIGNATURE-----

Make show_changeset show added/deleted files only in debug mode. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Make show_changeset show added/deleted files only in debug mode. This was necessary due to performance reasons. manifest hash: 35af5e8ff88a8706406fc8c42251ada79c7c9549 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCwOUkW7P1GVgWeRoRAvB5AKCJ9x/P3XOJVlQnCoh8cblnye+9RgCgkXLW 7Bt8/5yhPnsejYIGUMnppgo= =DNsf -----END PGP SIGNATURE-----

Use "kill $!" to kill running background processes. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Use "kill $!" to kill running background processes. manifest hash: 94563ef45ac0c8d15c9c827430f3d87380946434 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCv5QNW7P1GVgWeRoRAm+1AJwMopIWkvc/eG21mm/gbTrC9sCvhACePQl/ VOPdJKQxutQTCdAqA8iMzck= =7ejv -----END PGP SIGNATURE-----

Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags. manifest hash: b6c5a0bb17de794fc5822b0672af8b977bd77950 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCv5GIW7P1GVgWeRoRAimoAJ9s2RlZ3ljH8DZE2vbCmoWJX973LQCglo+s GmajRX7o3kJxY88aNGy+TNs= =TKmo -----END PGP SIGNATURE-----

Make show_changeset show added and deleted files in verbose mode. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Make show_changeset show added and deleted files in verbose mode. manifest hash: 189c2da64862f471b75b9d205907bff86c7423a3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCv4voW7P1GVgWeRoRAlLaAJsHGWEfNMMfDdsnk9/G9w86nf2I2QCgi4Rc 3HgiUFeTPi71I0tH+SV5Gsc= =/see -----END PGP SIGNATURE-----

[PATCH] umask for run-tests -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] umask for run-tests From: Bryan O'Sullivan <bos@serpentine.com> Another local factor affecting test breakage: umask. Mine is 002, but some other people seem to use 022. This patch makes run-tests explicitly set a umask. manifest hash: 39aaea44746b113e992bcf0a9e93d9de3961c907 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwOz8ywK+sNU5EO8RAvr7AJ9gRknqzQD6UmV1SpzHGqQyclcuxgCeItoD W7yNbrtIAPyMJsfwhVECx3s= =KhYb -----END PGP SIGNATURE-----

[PATCH] Set locale before run-tests does anything -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Set locale before run-tests does anything From: Bryan O'Sullivan <bos@serpentine.com> On Mon, 2005-06-27 at 11:58 -0700, Bryan O'Sullivan wrote: > I'm in en_us.UTF-8. This discrepancy between my locale and Matt's broke several tests for me, by the way. I think that the run-tests script should forcibly set the locale to either "C" or "en_us.UTF-8" before it runs anything. Since "C" is likely to be more portable, it's probably the right choice. Here's the patch. manifest hash: 1bf3291eafbde0cdeb1222bb72295c0e2974f236 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwOyVywK+sNU5EO8RAk18AJ4pYmvvJMZfFIR39NqvquXhhWPUTQCcDhhg Ce12AHU8o+m/aFToyRaaQL8= =5nRs -----END PGP SIGNATURE-----

Add initial hook support -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add initial hook support This adds the basic hook code as well as pre and post-commit hooks. Argument passing is by environment variable key/value pairs so that extra data can be passed over time. File lists will generally not be passed to hooks as these can be extremely long (>1M). manifest hash: 45cf9bab432782c391bc9c1c048c84cc75d52740 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwOukywK+sNU5EO8RAsVsAJ9QipR2aKRSSvoRNo+3If6JddUDkwCgkZrM KEmZpUOxhNHqezFVrHDRTjE= =aedm -----END PGP SIGNATURE-----

Remove stdint.h from mpatch and bdiff -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Remove stdint.h from mpatch and bdiff It's only there for ntohl and htonl and should be pulled in by in.h. manifest hash: 65954290279241ac92c9ce04c21cf1a3c9dd54e0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwD8KywK+sNU5EO8RAhv2AJ40R/T72XK63IbeEFqMLSRJbRJWdACcDa9r dOL9XpyYxR09REbAHw0JrlE= =8wkZ -----END PGP SIGNATURE-----

[PATCH] add clone command -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] add clone command Add clone command. Mark with-source version of "init" as deprecated. manifest hash: 3c31263474977c3d8303f45f71c44f7b7e10e97e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvzhOywK+sNU5EO8RAmh+AJwIlRfX143oxKShgPWF2dbDvCuH3gCbBrAW isIHptwVRX8pcA0lU638pHo= =ZoQy -----END PGP SIGNATURE-----

Pull from TAH -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Pull from TAH manifest hash: 470ea90dd95189a019f4d96016a45db8a297b841 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvzZzywK+sNU5EO8RAkZhAKCUJKX1vFtkFxV7qFwbuWQj62zcnQCfU687 jxKpBVesIXSOpBO4NbW/RIM= =hSBe -----END PGP SIGNATURE-----

Updated TODO -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Updated TODO manifest hash: c73376bc97920d14c8e29311a76313afd71ed457 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCvtiZW7P1GVgWeRoRAsdeAKCazz6dq6fiuq37FGsRKbavfW+4xwCeKbmG N7HBvJ71yVTX45heHiSh8c8= =AgqS -----END PGP SIGNATURE-----

Removed some unused variables. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Removed some unused variables. manifest hash: 89f5eba2fb642276b32d13dc12fe4c72448e47e4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCvquwW7P1GVgWeRoRAuLCAJ4lzcbSrQT2m+Kqxgktvih5FRlM9wCgmYDh a8QVhV8JyZBi5BbRNV2RHSo= =YpXM -----END PGP SIGNATURE-----

hg import checking for quiet mode didn't work. Fixed using the ui module. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg import checking for quiet mode didn't work. Fixed using the ui module. manifest hash: 3418ba604188b5abb2554615aff0ae59f4fee882 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCvqsfW7P1GVgWeRoRAjWVAJ9eNW+GnTJGvXMLxr1uPy5wM40gcQCeP6QO 7qW+m8/YmXLLi+vn2ETyWrM= =UGui -----END PGP SIGNATURE-----

Fixed call to ui.warn() -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fixed call to ui.warn() manifest hash: 3b82298c61822aaa41b4d9b579ec94a968a4b610 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCvqpMW7P1GVgWeRoRAotJAKCKG1BH2RKobak9ebapjViN8cQI1ACgisqU jghqrq9978lFUA9zjA/N2eE= =g65B -----END PGP SIGNATURE-----

Cleaned up command alias handling in help. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Cleaned up command alias handling in help. manifest hash: cfff5b739437073beddbc6e1f4c47ca958eeb1b2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCvqocW7P1GVgWeRoRAkM/AJ9iXHfhyAJH8kL167OiG95EJSsAKwCfWZFt 5S2AiXffxtPLIzxb/evzHZQ= =ppvs -----END PGP SIGNATURE-----

Update of doc/hg.1.txt -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Update of doc/hg.1.txt - - set date to release date of Mercurial 0.6 - - remove trailing spaces and other trivial changes - - add 'hg root' and $HGEDITOR. - - add another repository in the [paths] example manifest hash: 873f058d10bf58c1e54381715c82c1d1aeeee1e9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCvqRXW7P1GVgWeRoRAv/NAKCeiaHsrnUFDdlMMRj1QhL4gKvi6gCgkAL4 QhH/bw/Gjs7R+9LHJW/chxs= =G3kF -----END PGP SIGNATURE-----

Handle errors in .hgtags or hgrc [tags] section more gracefully. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Handle errors in .hgtags or hgrc [tags] section more gracefully. manifest hash: 85c62e1bf3ad78b243ee60f43c3c577700a8c96d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCvp6jW7P1GVgWeRoRAo23AKCZRU22IweynNtf9k3q4pEyqEaozACeMIRV 6tNOkr3h6jTiMZ2bJgPeabg= =+U5s -----END PGP SIGNATURE-----

Really _call_ method revlog.count in revlog.lookup() -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Really _call_ method revlog.count in revlog.lookup() This fixes e.g. 'hg export 398737777' (exists in the mercurial repo). manifest hash: 9de9ad4c40d0746cb3db346a01c373e3b4aba54a -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCvovbW7P1GVgWeRoRAiyEAJ9gVZZiMGA3YItcWRHeai/9C+dMTgCbBiii QoFaXQ9wZDds8fVVsvENAYw= =msWK -----END PGP SIGNATURE-----

Fixed diff generation in hgeditor if a list of files is given to hg commit. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fixed diff generation in hgeditor if a list of files is given to hg commit. manifest hash: 3eadc3637963778a35000fa75f229eb6b44ffc3d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCvoRsW7P1GVgWeRoRArNpAJ4p5NQBkv1X+eHwWU7+aqoGkcqwlACgklk2 e/vr9qiIPcOVrbYViapZD9E= =3fRb -----END PGP SIGNATURE-----

Minor speed improvements for bdiff -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Minor speed improvements for bdiff Consolidate the jpos/jlen arrays to improve cache locality. Do the same for the hash head/length arrays. manifest hash: e6d9ed36782741b1d6fcce8c2d00155a9540e81d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvzWxywK+sNU5EO8RAlTMAJ9+yl0dKIeWv4RegeLy7g6wcnoYwgCgk6la ip6KEAyBb7ktsX14KyZ5+/s= =utNJ -----END PGP SIGNATURE-----

[PATCH] Get run-tests working on 64-bit machines. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Get run-tests working on 64-bit machines. From: Bryan O'Sullivan <bos@serpentine.com> manifest hash: 3704997be1744478414cddcd79c7bea5ccd6a1b1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvfdvywK+sNU5EO8RAm5iAJ9mWxI4o2j7IM7Mko7IjfKfNtWJqwCcDekn 6GDlcDo/Q3nv8ybFzykwQjY= =tS2i -----END PGP SIGNATURE-----

extensions: use stdint.h -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 extensions: use stdint.h Not sure why I didn't do this the first time around. Hopefully still builds everywhere. manifest hash: 965582286a190728f8cc0dfb8e11ee56628a59a5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvfRgywK+sNU5EO8RAg9SAJ4/ZVpQZcDY5xovLDTZK2txEegEgwCdF2b+ lzSIP109qq8D+KIdUWsbEPc= =+0Yy -----END PGP SIGNATURE-----

Minor annotate performance tweaks -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Minor annotate performance tweaks manifest hash: 2edd508182c7b3dfb2e0b9b90baebdd364cb29f0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvfQeywK+sNU5EO8RAsYSAJ0R8SuWnyQxVgauoaEuezOe3Taq/wCbBnEs +VG0LNrXnQM9khQyc0+pCeg= =U5gX -----END PGP SIGNATURE-----

Fix up version module name and command conflict -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix up version module name and command conflict This unties the command name from the function name manifest hash: 926d097f75cbb5eb2464bb253e9a89050c6208bd -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvRLnywK+sNU5EO8RAvryAJ9RU0PLFOXjjtQjs8UVyOC9wde69gCgrV+G 8jYfMyWwvwsmOM7wMblPGqM= =Acyk -----END PGP SIGNATURE-----

Various node id lookup tweaks -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Various node id lookup tweaks - - lookup of nullid with lazymap fixed - - do the Pythonic thing with negative rev numbers (-1 == tip) - - bound ranges on rev numbers - - catch exceptions more correctly - - restrict node id matching to beginning of string on manifest hash: 15918cb74f41ac4bbf8bf02bc3bb599f24f0b5b8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvQzDywK+sNU5EO8RAnKfAJ4vzXnrGmRwOlPqNQFxxrUKchzAzQCcDkbi g3T3KiiVUckrWpziGq67YUE= =vrSU -----END PGP SIGNATURE-----

[PATCH] add "root" command -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] add "root" command From: Bryan O'Sullivan <bos@serpentine.com> Add "root" command Useful for scripting. manifest hash: a2df76139130ac034e53872f24f21f31b083bc42 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvQZGywK+sNU5EO8RAtYSAKCKRyuxzcDOTV9q+GY5WZDJ/VZgzwCfXhut VvGtiSnIqoBeQ/PtPsokMb0= =gUsq -----END PGP SIGNATURE-----

Add version command -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add version command Suggested by Arun Sharma manifest hash: 7fc056ffe45ee854f00e76916a560fba28c74a91 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvQW+ywK+sNU5EO8RAqGQAJ91Eysw4tHVpOB7ICeN9hMF/p+lfQCgksmg TAKr5VNrw2wIZtSKjgQRqiA= =8w84 -----END PGP SIGNATURE-----

Add hgmerge manpage -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add hgmerge manpage - From Vincent Danjean manifest hash: db96fb3109a588052b21e49df81cfe65c98e72d7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvQT2ywK+sNU5EO8RAmuFAJ0TFJ7K88OP/dMJVcFtD6Tiuon8SwCgl+W+ 4NgyQCJKwgfGF6nEhqJkgck= =Ymjz -----END PGP SIGNATURE-----

Add a doc makefile -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add a doc makefile - From Vincent Danjean manifest hash: ef14a37f8bdee641148e705ba13ce386cf29316a -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvQSmywK+sNU5EO8RAh/QAJoCDQVUKS8uYO5kcIqJBsrKYtj+FACgmSvI FnYSmWjUX5kLbDHdQqM6jls= =fPAM -----END PGP SIGNATURE-----

Merge from http://moffetthome.net:8012/ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Merge from http://moffetthome.net:8012/ manifest hash: 3a67864af6b0276eabe640274633ca2625dbd4a5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvQKkywK+sNU5EO8RArUHAKCSGtpEfJwYGoAIpj4mBDvcPted9wCgnzML xr8WQ8DdPkJ9DVsLjvsbhJU= =O7Fd -----END PGP SIGNATURE-----

Added stdint.h include to fix build on Mac OS X Tiger [v10.4]

Fix pipe timing for copy test -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix pipe timing for copy test manifest hash: 75c389c84f4edacdd9163b6e5234f3ea334ca4b3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvQEDywK+sNU5EO8RAtGDAJ0QKBXRg8qQ/Vkye9xEatVUREtU1ACcCISd cJDQzk62ukLW2/gcCLOHHMQ= =tpar -----END PGP SIGNATURE-----

[PATCH] /dev/null for other OS -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] /dev/null for other OS From: K Thananchayan <thananck@yahoo.com> Null device name is platform dependent. Introduce util.nulldev - - platform dependent constant and use it instead of '/dev/null' manifest hash: 95a1bfdb712c53ef97aaff73f7f4c87e9299cf59 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvQCGywK+sNU5EO8RAiRBAKCcXasCCFT2+6wgklkgqIt4l3UwugCeKWii h/8iRYEw8Rp8B67abiFiwyY= =L3Mk -----END PGP SIGNATURE-----

add dirstate debugging commands -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 add dirstate debugging commands As I've played with various different merges and more recently rawcommit, I've found the following patch to be very very helpful in figuring out whether the dirstate is being left in a consistent or inconsistent state with respect to the current manifest. I attempted to deduce the invariants that were assumed by the current code, and then check it in this code. I may or may not have captured the design intent in this check; if not, I'd be very happy to hear more clearly what was intended, so that I can write tests to that expectation. Anyway, here's the patch. Not sure if it's a good idea to commit it to the mainline, or just leave it as a debugging aid. I attempted to package it so that it doesn't interfere with normal usage. Michael Fetterman (tweaked by mpm: remove -d magic) manifest hash: 869f5b5f954dc0f46ba27322359e811d5e21d71c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvP77ywK+sNU5EO8RArmtAKCCVuI2slANzWZ26P5edtH/ixdwNwCfZLWl 5P+V+C92II3usO4YW2MULKY= =/Pv4 -----END PGP SIGNATURE-----

Add an RPM spec file -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add an RPM spec file manifest hash: 4b0a028ee71e7bf1faa4fd6fe0d9efce0b04bf3a -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvP1jywK+sNU5EO8RAiWVAJ9083+cHfhDn4kjnULikci6nQEvMACdFGyg 1Lv0tujumR2E9lvFe2c4eIw= =kKKS -----END PGP SIGNATURE-----

Added tag 0.6 for changeset 12e0fdbc57a0be78f0e817fd1d170a3615cd35da

Release tweaks -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Release tweaks manifest hash: ded5f9b4432ab05c28d6e0ca56adbf3d14b8e6f6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvGzZywK+sNU5EO8RAlzYAJ4ix4F5cKYXBo8L6UwwZJbnZa7RpgCgme9H ByLO3Pcf9RSmQEO6vxYfuLs= =7fKS -----END PGP SIGNATURE-----

More FAQ bits. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 More FAQ bits. manifest hash: dd8aa534d3e72aa33f4fd7270d3750cefc2c40a9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCu54aywK+sNU5EO8RAud5AJ4699rQiuiZ2TKdZzkG6iGU/UaG8wCgr4Jz euPp7E7arLNoOYtzCbGCSks= =l3sX -----END PGP SIGNATURE-----

More FAQ updates -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 More FAQ updates manifest hash: 98447c3da5aefcc6c4071d03d8014944cf4cbb79 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCu3TCywK+sNU5EO8RArRjAJ0ZtMHztUL1cQw7FC0C3uJ0YIfKjwCfWfSe JndrQxPs1QeCPK/RbfYiKjE= =aMHP -----END PGP SIGNATURE-----

Add 'local' tags -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add 'local' tags Local tags are repository-private tags that override the usual tags. They're not version controlled. manifest hash: cce27c853d36f03adba4bd543a37c8faf1a0c749 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCu3SSywK+sNU5EO8RAlVAAJ9sTyIW2EkzBPSPp+3uU6a+6DUC6QCcD0vE jiwqhtfCuvG5LLs54LkzamY= =D9IP -----END PGP SIGNATURE-----

Clarify doc/README a bit -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Clarify doc/README a bit manifest hash: db94c24344b56655bea5123ff79db75c7fa2d44c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCu2cHywK+sNU5EO8RAuh7AKCZu3ZyrLaCvwlUvc8yY49hNOr2FwCfeQ8w Rpnt3GiIZ5PN01SwFt0B5jE= =953M -----END PGP SIGNATURE-----

rawcommit: do lookup of parents at the appropriate layer -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 rawcommit: do lookup of parents at the appropriate layer manifest hash: fc4b2d4416d00da5db2f4659e42ecba2a96dba1e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCu2UoywK+sNU5EO8RApdDAJ9Vph6qVyzL++YeXyFC8HKf9ZhkGgCeNc0Y j2AMu6aWmuLuy2XwztS8gms= =f8mQ -----END PGP SIGNATURE-----

Make lookup a bit smarter -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Make lookup a bit smarter Handle overflow error Handle "0000" -> nullid, not 0 manifest hash: f3af0c171216687c621fd0214efe45775e5a1d34 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCu2PrywK+sNU5EO8RArqWAJ9hafXgnHjCDE/Sxtvyo+e+qmPaGgCfR8AV DCG3i0NasG3ItbPvux2Dm5Q= =zjqN -----END PGP SIGNATURE-----

Get set_exec from util in convert_repo -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Get set_exec from util in convert_repo manifest hash: 82fa9db49fa56127d59a7aae70b3c0527420ddad -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCu2LTywK+sNU5EO8RAjBwAJ4+8ME5PPzQumB4u8R0zpX84tqm8QCgqhzE cd83i0X45u09mKFNFruaHYY= =9LfW -----END PGP SIGNATURE-----

Cleaned up some asciidoc bits in the FAQ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Cleaned up some asciidoc bits in the FAQ manifest hash: d21d57210696587dbb6a30a711f77612ed20f40e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuzPpywK+sNU5EO8RAm6JAJ4kgJKyU2v0e/TL3elPWt+8IiN+2wCeKwVa iaJSNgsrzdNmNhhlzaQ267c= =A8Xr -----END PGP SIGNATURE-----

Minor packaging fixups -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Minor packaging fixups manifest hash: f588ece18c1e43697c4188d94ecb034e591913a1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuy7aywK+sNU5EO8RAoxdAJ4l8MRhmzBo15LPnk/kb11MbSYwMQCgrLuJ o8LeT5YpTESNtXcKqA+2dxg= =lcNo -----END PGP SIGNATURE-----

Update TODO -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Update TODO manifest hash: 6de50aff50eb482a3358a72ff0108b446688d034 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuy6CywK+sNU5EO8RAuJsAJ9Ruxq09SmJSrGY9nlQvieYohFEAQCgjzc1 rjTPS0nh0mHuoE41orgop5A= =q2oN -----END PGP SIGNATURE-----

The beginnings of a FAQ file -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 The beginnings of a FAQ file manifest hash: 234ee7d9fb5cd3b0bd794e615a74f96a4cc234e0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuy48ywK+sNU5EO8RAmdYAJ923bFC/a6q28nVYumWsaQ+axlKawCfS7IC kh1xVlj5OYOloicyaHDhLU4= =7CJ2 -----END PGP SIGNATURE-----

README tidy-up -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 README tidy-up manifest hash: 3093d78dfb6ba9ce83ae96d0a04ad5351b3088af -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuy4WywK+sNU5EO8RAiwBAJ46tZBe1PLzKM+e70rdEF7wYtVrwgCfZoeo Gjt1DE0ZxkSFyWW5erIqyfI= =xF6B -----END PGP SIGNATURE-----

Add rawcommit tests -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add rawcommit tests manifest hash: 6989f36a35fd7278393814623cd10b919b3c3803 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuyrVywK+sNU5EO8RAoG/AJ9OZktC6aDopPIKdJT+WHTZrG9mLgCfbAFM 0JL5AQ67+IazfIvMATCz97Y= =QJWw -----END PGP SIGNATURE-----

hg import error checking -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg import error checking From: Chris Mason <mason@suse.com> hg import wasn't checking the return value of patch and wasn't making sure the list of files collected was unique. manifest hash: 85b2a0f0602cfff6ba6a61128a50d79d7fb6e1c7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuym/ywK+sNU5EO8RAlwSAJ48h8hHi3JMNwrVq0CXIfgMCTGRRQCfSfpP 9kHam+Rt8tra46lCQ4d27G4= =P00x -----END PGP SIGNATURE-----

rawcommit dirstate tweak -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 rawcommit dirstate tweak Before this patch, rawcommit can mess up the dirstate unless it is committing against the current parent. This patch changes rawcommit, such that when adding a child to some node other than the current parent, rawcommit does not attempt update the current dirstate. This seems easily debatable; it creates an asymmetric behavior for rawcommit. It means that when doing a rawcommit against the current parent, there's effectively an implied "hg update" to the newly created node. When doing a rawcommit against any other node, no such "hg update" occurs. The other obvious alternates would be: 1) rawcommit never update the dirstate 2) rawcommit always does an "hg update"... This patch also includes a test for various uses of rawcommit... Michael Fetterman manifest hash: 428517d82a02501f14b0d8fac064411980780e91 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuymPywK+sNU5EO8RAvdvAKCxW1QZtyOviNfuwO592IaKApwvEACfdrYD 83m/o8oJvRKu3yGvNGHtwfk= =KbmU -----END PGP SIGNATURE-----

Permission handling for the other OS -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Permission handling for the other OS From: K Thananchayan <thananck@yahoo.com> Preserve exec permission under Windows on existing source files. Not an ideal solution as there is no way to specify exec permission for a new file. Nevertheless, this helps working on crossplatform projects. manifest hash: c50da52ad4645f40bd6204c4fd458e880bc3f801 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuvJeywK+sNU5EO8RAscXAJ40eAHZjTip5to6BGPdoXxxL5gNQQCgl5GT 8S1Ckank5I/0ScGtapZKqTA= =QrQp -----END PGP SIGNATURE-----

Fix up tests for command name changes -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix up tests for command name changes manifest hash: 04b04d0b2ca96f29b3b9a52e4ed8478ee7e2761f -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuvDTywK+sNU5EO8RAnKzAJ9JSRUsVy/kHp3CweXpsJiu+fXCKQCgq0Pt OOUKYPj6aJOvxB+Zz17X8dg= =EyYE -----END PGP SIGNATURE-----

Use __inline instead of inline -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Use __inline instead of inline This should let us compile bdiff.c on the other OS. manifest hash: c1233bb3c7fc060e49dbd2597c122d903797db9e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuu/WywK+sNU5EO8RAtqvAKC0d8Kv8He6xNCwmFnvKcff9BT4gACeLq7n 9JDFxYtWMrgjwlShfay1nL4= =GDFt -----END PGP SIGNATURE-----

Update docs -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Update docs General editing of man page adding new commands, removing old, updating usage Remove generated docs manifest hash: 68e3fa38e8ec38e80debd95854e1374a9d24fbe0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCule6ywK+sNU5EO8RAm6SAJ0eQwB5eFG1WeswqNMRqUEclmMaNQCeMcYY Y+UCHuN6vQ4PgEUKt91+rEo= =PAAA -----END PGP SIGNATURE-----

Commands cleanup -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Commands cleanup move patch function to import_ strip underbars from function names in help remove debugaddchangegroup and debugchangegroup remove -q option from import remove some aliases: ann, dump, dumpmanifest, merge, resolve add rm alias manifest hash: a3259c52d69be93e272b336098ab8549ec1922bb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCulc9ywK+sNU5EO8RAvLqAJ0fIvuSCYZgXUBubBREL7dfg5y/yQCglYte AwWOEQJoLGHXbpvPYI1uljo= =hQeO -----END PGP SIGNATURE-----

Optimize annotate a bit -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Optimize annotate a bit Keep the original text around so we don't need to rejoin it Use slice insert-in-place rather than += to construct new lists Construct the decorated list with list multiply rather than comprehension manifest hash: 8c0effb9777750d524d71ad3a2eade3c6ddd579e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuca0ywK+sNU5EO8RAtvQAJwOViomGCtlZx/R76i8/CZGvGPqUwCfdybd nRUv1854GjzCbfygzXfeIes= =6Q+E -----END PGP SIGNATURE-----

Fix a compile warning for bdiff -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix a compile warning for bdiff manifest hash: 263a8d670a4960f57b6738d41b40626efe1d90d5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD4DBQFCubyMywK+sNU5EO8RAvw5AJ4usI49PlchNMgytp29Fajf+6aGfgCY/7YV PBZf1pfbBH3nO0gEi33CNg== =cw8/ -----END PGP SIGNATURE-----

Replace difflib with bdiff for annotate -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Replace difflib with bdiff for annotate This is a quick hack to get bdiff working for annotate, can still be optimized quite a bit. manifest hash: 380ae3092c73b7e1946952edec3588248bc13c5e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCubxGywK+sNU5EO8RAv7RAJ9lTdxRAVqzGs4XnPoZAmx/fbeUZwCfWar2 RqLGipS5JmMOy1pL1ehNxqY= =KLgM -----END PGP SIGNATURE-----

Add bdiff.blocks / minor performance tweaks -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add bdiff.blocks / minor performance tweaks This refactors bdiff.bdiff so that we can get a list of matching blocks of line numbers for use by annotate/unidiff. Minor performance tweaks: - - add a field for equivalence so we can keep h around a bit longer for cmp - - mix len into the hash to reduce collisions - - move an operation into the slow path in longest_match manifest hash: b1aee590b6291b31069ea8a86b6aa8fb259ac244 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCubu2ywK+sNU5EO8RAm4FAJ9r10aJpT7qA96nqGYFHcuy4XcIHgCfeFx5 q0PyTXeZQc7Fw5kwEPcoykI= =QXSb -----END PGP SIGNATURE-----

Start using bdiff for generating deltas -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Start using bdiff for generating deltas manifest hash: bf6ed7d17d96810b7f40b50811b104b568c64b4b -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCubqVywK+sNU5EO8RAor6AKCm8Zqg0DIhLzaMPp5/GKPKk/GjKwCfbCe+ /CBmpvcTxSJofY9RE08cCVY= =2yu2 -----END PGP SIGNATURE-----

convert-repo fixups -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 convert-repo fixups - - deal with octopus merge uniqueify parent list add a series of identical commits with "(octopus merge fixup)" - - add "committer" field from git to the commit message manifest hash: e33d802afe35edecfc5cc9b567def6db2b0cb885 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCubogywK+sNU5EO8RAkWgAJ9OVHeumKd/nRIfvS/nQ9eSbORqNgCgpBIE Dza0L59OSJHHmm3Dbp7ygds= =OEvJ -----END PGP SIGNATURE-----

Fix up test-merge1 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix up test-merge1 The third test was wrong and showed up after fixing the typo in compare code manifest hash: 306ab9936457ad90e7c7a226d6407ca586262650 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuPH8ywK+sNU5EO8RAql+AJsH/bxFMTMbUiaEoLNhXS6wNkzLAgCfQxDJ 3j5pZ3MzrtPD0y4wC3vIAA4= =VKEy -----END PGP SIGNATURE-----

Pull from TAH -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Pull from TAH manifest hash: 600d04efbd836d555d11a3bd9d821d1d8c0a9790 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuPFxywK+sNU5EO8RAjfzAKC18Zc2EOkXhy1zcpgGnyPHnFMdmgCfW5Ut I5HSWqZMt8H0WJx1Or7ajNc= =27D5 -----END PGP SIGNATURE-----

Fix typo in merging new files -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix typo in merging new files manifest hash: 4a6fee1e54c5c465a74f4d756a1ac549b15fdb2f -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuOvVywK+sNU5EO8RArovAJ4ua9EhnO8wWfKRZ36E6F4Wrv5JPACghCXn sHr/TSkxdy48OUVkhTbhhhQ= =poww -----END PGP SIGNATURE-----

Make it possible to specify a version number in setup.py. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Make it possible to specify a version number in setup.py. manifest hash: 905feb305205801eb3833e5a84161fb57b83c86e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCtc/QW7P1GVgWeRoRAlCaAJ9G2GRf0wIEVEbYNoV4PjV4b024bQCfcUFf WVYQlTXqninDXyKas2yQYdo= =ofg/ -----END PGP SIGNATURE-----

Allow hgrc's proxy host and $http_proxy env var to start with http:// -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Allow hgrc's proxy host and $http_proxy env var to start with http:// manifest hash: 5bf4bb43606f3e5544d55be886502ab5a61f9ff3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCtcR6W7P1GVgWeRoRArk0AKCgHpelPjAKjbzh3iifZayAhovm+gCeL0hl XU7LBUrK2Z2qQHN0w9I8XUk= =QaAW -----END PGP SIGNATURE-----

remember_version() only writes version if called in a Mercurial repository. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 remember_version() only writes version if called in a Mercurial repository. forget_version() resets version only if remember_version() wrote it. manifest hash: b30df9d93c233f4bf07150cc5067f294a98c16f4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCtXFiW7P1GVgWeRoRAgkjAJ9jkwCAHf3yJyDI8R582XjNFNFeWgCZAe27 iqGPYzrRErf6gPKZcoBMsD4= =t2Bx -----END PGP SIGNATURE-----

Allow override of HTTP_PROXY, http_proxy and no_proxy; make no_proxy work. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Allow override of HTTP_PROXY, http_proxy and no_proxy; make no_proxy work. manifest hash: cfddccef1e8acaa8b06e652e5bbc274d31f0df1d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCtIp/W7P1GVgWeRoRAgNRAJ4//Ptbq9Cba7S2L5ltvP92gcijZQCeKuU/ S/togHQXp34v2ypVH+8wyP4= =jpn2 -----END PGP SIGNATURE-----

Support for 'hg --version'. setup.py stores version from hg repository. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Support for 'hg --version'. setup.py stores version from hg repository. manifest hash: c69058298ea12035f2cf356f987ba2fb5ff4bbae -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCtD6ZW7P1GVgWeRoRAnGHAKCLscthht2UlBEMDmxL9cku4PlcswCffOVo wTOhYkW4Ie5+8bdmL8EqsvY= =uGpn -----END PGP SIGNATURE-----

[PATCH] Enables lock work under the other 'OS' -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Enables lock work under the other 'OS' From: K Thananchayan <thananck@yahoo.com> os.symlink is not supported under Windows. This patch introduces util.mklockf, util.getlowner that use regular files under Winodws but symlink under unix. tweaked by mpm: - changed function names - fixed to work on UNIX manifest hash: 6f650a78a3b203dcad2f861582500b6b4036599a -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuN5sywK+sNU5EO8RAva8AJ9L9z/JHRAJS1bix48ZzSpn9ZUyPwCffhmg UfLSFBmd5tPDDi3mgsrdDEA= =ZYS9 -----END PGP SIGNATURE-----

[PATCH] rename under the other OS -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] rename under the other OS From: K Thananchayan <thananck@yahoo.com> Rename fails under windows if dest file exists. This patch add a rename method to util module that removes the dest file and retries if initial attempt fails. manifest hash: 2744d9fd1717e15133b411a269df909fa8ec0faf -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNzDywK+sNU5EO8RAsPBAJ9NQN3bTuJvTem5x+utGnoMkhYc0QCbBFSJ PoMP69H1UnVE6drFlnlFE0s= =pePw -----END PGP SIGNATURE-----

[PATCH] Repo locator fix for the other `OS' -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Repo locator fix for the other `OS' From: K Thananchayan <thananck@yahoo.com> The following patch modifies repo locator to behave properly under windows. manifest hash: 481252f9667ab5408dc1985a72a1916f903f4f2b -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNv5ywK+sNU5EO8RAvD9AJ9mYSzmn99sc2vNtw68sPaKKWe2UQCgoiLd 1q1t+JMs57+I0LUdwrwsEDw= =dlmm -----END PGP SIGNATURE-----

[PATCH] file seperator handling for the other 'OS' -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] file seperator handling for the other 'OS' From: K Thananchayan <thananck@yahoo.com> The following patch maintains repo root relative source file names in canonical form (with '/' as file seperator). Mercurial calls os.path.join, os.path.normpath, os.path.walk that use platform's file seperator. This patch does not change seperator in these circumstances (except when the result refer to source files). manifest hash: 2fbb4cb0d3d0bc4f4de5c7c8803fb738072ec6c5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNuBywK+sNU5EO8RAhAZAKCV8cz11+rdof9n1tHb0uDScF34GgCeITNi 4aVikToPXqXyReN9kFP5pnY= =xcV5 -----END PGP SIGNATURE-----

Minor tweak to binary mode patch -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Minor tweak to binary mode patch manifest hash: 4fce0b7b405b124e035526d4a458e888d9bd82ef -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNr1ywK+sNU5EO8RAs83AJ9i+yafrjWWjWm1lTwCr0fO8cAU+gCghmxg +S1W1KuMzgxJAtuhq6h6uBk= =9JhP -----END PGP SIGNATURE-----

[PATCH] file type fixes for the other 'OS' -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] file type fixes for the other 'OS' From: K Thananchayan <thananck@yahoo.com> Filetype fixes: All working files and files in the repository are processed as binary. .hgignore is read as text when constructing ignorelist as this file is intended to be edited. manifest hash: c034cdcc54011fd3de9e32f1aa8b2b6f84e1b2b8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNoRywK+sNU5EO8RAjarAJ9ScUoFL1A7mpO7qorCy6okhi0nggCcDgpp dfDl4dALGQA0PqXqtI+T5gU= =IVxr -----END PGP SIGNATURE-----

[PATCH] Removal of a file added by merging branches -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Removal of a file added by merging branches From: Michael A Fetterman <Michael.Fetterman@cl.cam.ac.uk> Fixing a bug where removal of a file which is added when doing a merge would cause python exception to be thrown. manifest hash: 0bdd80e8abcee6aaa4804bb588f9939596fb3dd0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNjLywK+sNU5EO8RAo44AJ4mvjsJcYOj/EmVDFrdkK3D3WHFSwCffxfV cRl8mXc252/oRcYaMZbgrlg= =S5x6 -----END PGP SIGNATURE-----

[PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted From: Michael A Fetterman <Michael.Fetterman@cl.cam.ac.uk> If an "hg update" is attempted across branches, it is aborted with an error message, basically saying that "update -m" is required. Don't prompt the user for "keep vs delete" kinds of questions before deciding to abort. manifest hash: 250d3a0e866af2feac9344d499b26c254c33abc4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNeDywK+sNU5EO8RAu2BAJwNWXXN2L+4TnOUGaOe9iBj6CgOYgCfRKIE RF5czx2UQ2pSIP119xzq9mQ= =Akj6 -----END PGP SIGNATURE-----

Fix ls output for test-flags -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix ls output for test-flags manifest hash: 491b49f66da7c19cbfe9635dc03e4ba510052ed3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNc4ywK+sNU5EO8RAilRAJ4gOaWbFqXOkat4jCZfierb8aTZvACgr8NP TrvpZ3vWf0aY0bYkkGQDSDw= =HVCS -----END PGP SIGNATURE-----

remove double assignment -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 remove double assignment spotted by Goffredo Baroncelli manifest hash: a0406a618ce5b2b9b10073b29960d594094aa3ed -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNXhywK+sNU5EO8RAh9yAJ0aVTnxsumDAdF3JORp1pDebxeE8wCgisdG vf/JwxHbQEqGrefU1nbs928= =NDGW -----END PGP SIGNATURE-----

[PATCH]: Typo in localrepository.update -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH]: Typo in localrepository.update From: Goffredo Baroncelli <kreijack@libero.it> I think that there is an error in the method update() of the class localrepository. The variable 'm2n' was used instead of 'man'; so the parent2 flags is computed instead of the ancestor flags. manifest hash: dc11810367615245c4b39660d135ab3c0e71b85d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNWpywK+sNU5EO8RAv9ZAKCxwbd242xZQ1CCrW2WDdQ4gclKtACghXYl 7j1YTRpINItwdXzak3cBS60= =+Tf8 -----END PGP SIGNATURE-----

Add 'other OS' bits to bdiff.c / style cleanups -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add 'other OS' bits to bdiff.c / style cleanups manifest hash: 9a0ef60a59af0594f95a2b22de243fe8ef059762 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNL0ywK+sNU5EO8RAg+yAKCe8dG411HdZZvsxB25AtfBBApQBQCgnb7O MGO0xvEBgAtt+3F+VJBkiU4= =F7r7 -----END PGP SIGNATURE-----

Make mpatch.c compilable under the other `OS' -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Make mpatch.c compilable under the other `OS' From: K Thananchayan <thananck@yahoo.com> manifest hash: 7b3033b761b147149fb0bcd6ff6120ccb73f16f1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNJCywK+sNU5EO8RAtMVAKCJxQYOa7VX4DYKDPw02ILjINiDmwCggreC 9Xw/stNxkV7zVY2IFDC14is= =tFmZ -----END PGP SIGNATURE-----

Pick up tests from previous patch -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Pick up tests from previous patch manifest hash: 3ec4c3cb96e15322f7489d89b7b92ee214f6cfb9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNIaywK+sNU5EO8RAuGOAJ9YXXfXstC6wysknsXPAL9jDeiUDwCgpFJ3 P5goy7Zw3ypinBEwZrhgXM8= =6fKs -----END PGP SIGNATURE-----

[PATCH] Merging files that are deleted in both branches -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Merging files that are deleted in both branches From: Michael A Fetterman <Michael.Fetterman@cl.cam.ac.uk> OK, attached is an improved version of this patch... When I went back through it, I discovered that the prior version was wrong when doing real merges (as opposed to jumping between revisions that have a simple linear relationship). So that's been addressed here, too. > Here's an hg changeset patch that deals with simultaneous deletion of a file > in both the working directory and in a merged branch. > > Test case included in the patch. manifest hash: c8078733c252403314d8046efa6ecefc49c83050 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNF8ywK+sNU5EO8RArtdAJ9syw/JXRZzP1sxnEYXzZywkJLAPACeKpqL 5osA3AggrCbbSLTNcYVXJ8U= =T5Ik -----END PGP SIGNATURE-----

[PATCH] Merging identical changes from another branch -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Merging identical changes from another branch From: Michael A Fetterman <Michael.Fetterman@cl.cam.ac.uk> The issue comes up when a local uncommitted *new* file (i.e. not in the current manifest) is being merged with an identical file from a branch. Since the file is not in the current manifest (it's either in the current "to-be-added" list, or in the "unknown" state), there's no (local) node from which to create a mergepoint. manifest hash: 4e64ce654a6473524789a97bbaf8bff61b4343af -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuM/1ywK+sNU5EO8RAn7xAKCJoH/CgzVK4h4xPJDrd2lY9XOINACgmt01 92uuMswZXcoCchQAaxew7C0= =qRsk -----END PGP SIGNATURE-----

[PATCH] Using monotone-viz/git-viz with mercurial -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Using monotone-viz/git-viz with mercurial From: Vincent Danjean <vdanjean.ml@free.fr> monotone-viz is a small GTK+ application that visualizes monotone ancestry graphs. Its home page is: http://oandrieu.nerim.net/monotone-viz/ As monotone and git are similar, the author adapted the 0.9 version to display git ancestry graphs and call it git-viz. I cannot see any link from the homepage, but looking in the archive of git ML, it can be found here: http://oandrieu.nerim.net/monotone-viz/git-viz-0.1.tar.gz I few days ago, I adapted it so that it works with the last versions of git/cogito. Patches and package are available here: http://dept-info.labri.fr/~danjean/deb.html#git-viz Today, I patched hgit so that it respects the output of git-diff-tree, I added git-{diff-tree,cat-file,rev-list,rev-tree} that call hgit (2 lines scripts), and added the script 'hg-viz'. hg-viz create a .git directory and store the SHA1 of the tip in .git/HEAD and then call my git-viz. All these modifications are in the attached patch. I try it in the mercurial repository. After applying the patch, you just have to add the contrib directory in your PATH and call hg-viz. An example of what we can see is on my web page (probably not for a long time) : http://dept-info.labri.fr/~danjean/temp/hg-viz.png Vincent -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuM50ywK+sNU5EO8RAtlvAJ425JJI9chCdSi8D+R2Af/vJEOUpACffC9e fxjJ3umBkffj5g86jWaRGZ0= =LwA2 -----END PGP SIGNATURE-----

Check if repository exists -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Check if repository exists From: Goffredo Baroncelli <kreijack@libero.it> Subject: Re: Trivial: in remoterepository.__init__ check if the repository exist I hope that this is correct :-) Another typo, another patch, tank to Peter Stamfest and Radoslaw Szkodzinski. The patch is trivial: adds a check in the body of the init method of the +remoterepository class. Before if the path didn't exist, hg would not raise any error. Test manually performed after the patch has been merged: test: result create a new repository from another local repository OK ( no problem ) create an empty repository OK ( no problem ) pull from a not existent repositary OK ( raise an error ) (error message tweaked by mpm) manifest hash: ac7f625a8d87c693b61718b9fc5604d28b882bbd -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuM0gywK+sNU5EO8RAsnGAJ42HE3m01tlGqrIR3GVfuhvCjEJkgCfffvp bEhfvjaiAdBV50HMULq8N00= =QDHW -----END PGP SIGNATURE-----

[PATCH] Unintuive use -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Unintuive use From: Vincent Danjean <vdanjean.ml@free.fr> > 1) "hg pull" does not tell what and if it does something. > 2) hg does not tell if the data have been merge or not, if we have to > call resolve, ... Here is a patch for 1) and 2). It also add an option to 'pull' to call update if there is something new. Tweaked by mpm: - change message style - use ui.status - change option from resolve to update manifest hash: a61a7af00ef2f33867f6c88f95dc8258cb1a3e51 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuMcpywK+sNU5EO8RAucjAKC06gwAico7Wz5YOcp5u9NVxEhItwCfcIzA VmiifZTj5ZUjTTcPhmiKh2M= =rbLT -----END PGP SIGNATURE-----

[PATCH] rawcommit fix again -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] rawcommit fix again From: Christopher Li <hg@chrisli.org> Rawcommit need to allow no argument when using file list options. Chris manifest hash: 049977598f355ad9e54eeb18f8831fc4c1fee36d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuMR9ywK+sNU5EO8RArXFAJ98iZaSIzsc0KBgtMW5v4yVuWfpZQCdH2yQ bYOgCTRNapYqq5YtnOHfErk= =1Poe -----END PGP SIGNATURE-----

[PATCH] (3/4) Removing an added file -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] (3/4) Removing an added file From: Michael A Fetterman <Michael.Fetterman@cl.cam.ac.uk> Here's an hg changeset that deals with "hg add"ing and then "hg remove"ing a file without ever committing it. Previously, this caused a python exception at commit time. Test case included in the patch. manifest hash: 4d012f3f8b1aa664fed9e8bc2849931b28728acd -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuMPtywK+sNU5EO8RAuxMAKCmeMLqOUBmUfCfbQgYOAysOvKkwgCfcJai 2My0M7KqhwnJSbZXbGIOcow= =N7N0 -----END PGP SIGNATURE-----

From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> add hg tag command Tweaks by mpm: clean up error messages handle non-existent .hgtags file add tests update test-help output manifest hash: 569c7fe01193159919af2566e8f5089409ffad65 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuMMwywK+sNU5EO8RAuUdAJ90TkT/D9lDOnEVAW2d3WT7K8Ct3QCggiJA c9Qbd79K4UWKQAVkYq03cOY= =SWS8 -----END PGP SIGNATURE-----

Add a fast binary diff extension (not yet used) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add a fast binary diff extension (not yet used) manifest hash: fbfdcab2b1f4856af45176fcf2423d602dfe88c4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuL6eywK+sNU5EO8RAoT+AJ95z9gx2IrucBS30CnCQFkZT7lSbgCgnXh5 ScZcgwzJ/mEo9i5vuKNlCIs= =Gr58 -----END PGP SIGNATURE-----

Delete error logs one test at a time -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Delete error logs one test at a time manifest hash: 746674a89f762a39cf1a679a258a92cd02440f95 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuL3ZywK+sNU5EO8RAmYeAJ4uUd+zBdGx/H/CGKxXLjKX0vlDBwCfVRAA zVnvyYT9CnmsctYE0NKXVVU= =G53w -----END PGP SIGNATURE-----

Quiet successful test install in run-tests -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Quiet successful test install in run-tests manifest hash: 73bb9dbf52a1c0d7ec50f4f7801c23735b67f94f -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuL00ywK+sNU5EO8RAvoqAJ0QY538fracpIu1/TgVnqQXlAZKOwCghbMO SLTy7QnYViCHjvYj9oegx/s= =BgHs -----END PGP SIGNATURE-----

From: Andrew Thompson <andrewkt@aktzero.com> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 From: Andrew Thompson <andrewkt@aktzero.com> Make a local temporary install of hg for running tests Delete old error files before running tests manifest hash: bbae21d506ce5be8df5dc97f14fcd0f8aece0b20 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuLyQywK+sNU5EO8RAvROAJ93xEPZNphcpoLxGCMNkZ7SfL6+AQCfXCHZ 3kMQAuZnxo0dn98of/LVecY= =bsV2 -----END PGP SIGNATURE-----

Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli. Changes from the original patch: - - Use 'diff -r ...' instead of 'hg diff -r ...' to support filetype detection by at least file(1) and vim. - - Adjusted tests for this change. - - Some cleanups. manifest hash: 5f37d1ef75ea7f4e48b53f02371053ba54fb70f8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCsyZzW7P1GVgWeRoRAqczAJ479lR9Z289sP+VH5L+N7pQRU14SACfUueq 88ABloIR3VyRIa4qbujnZio= =Vva9 -----END PGP SIGNATURE-----

commands: report http exceptions nicely -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 commands: report http exceptions nicely manifest hash: 37760b304eedffcea9c1c01d03334cf4f6048fd3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsx6QywK+sNU5EO8RAnyEAKC3RBzwlVAyI+SSYHj1Z+Psn1Aq3gCcDQJf pqPitXBuvdZbLdK0ti2kFOk= =ZjC9 -----END PGP SIGNATURE-----

Add COPYING -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add COPYING manifest hash: 7ca259e873d941d922b46c7fbf39696e258149ce -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCswkdywK+sNU5EO8RAtB9AKCrG7JLOFwEKLjr/TwdvcqjjHmzJQCfcFUK lBazBFg3F2G3knOABzuSqPA= =i2Qb -----END PGP SIGNATURE-----

hg init: add -u flag to update -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg init: add -u flag to update From: Andrew Thompson <andrewkt@aktzero.com> I was trying to get init to run update by passing an option. The basic part works, but if you use the -u option, you have to specify the changeset number, tag, or tip. Anyone see a way to make this work easier? (minor tweaks by mpm) manifest hash: 9e39e822693e1f175cd5e02a8d4a984d82afbd92 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCswJaywK+sNU5EO8RAuILAJ42ZVtnHnlbq/xz6SxhaWLtI4KZ/QCgqS6F 6EDjkfy1F8dmBTf8Ob3ac/s= =f3WC -----END PGP SIGNATURE-----

Tidy up conflict and pull tests -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Tidy up conflict and pull tests Fix failure to kill hg serve process and pipeline ordering with set -e manifest hash: eaf968ea8ae9fe1fc94f04b99080eabcc6eafd88 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsv9vywK+sNU5EO8RAh2aAJ4iynCcNhmQeOy9+dq+v+9IundFIwCfWHgg pI3IH2BvqUlckdLwx3M5jcQ= =s/QA -----END PGP SIGNATURE-----

hgweb: pull cgitb into CGI script example, where it can easily be disabled -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hgweb: pull cgitb into CGI script example, where it can easily be disabled This also eliminates cgitb dumps in the logging output of hg serve manifest hash: a0aa07a706c2c388c0b49505e2960197f716920c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsv9DywK+sNU5EO8RAieFAJwOjdfkz7pILNVUTvpMkRa6/OIhIQCgo2TP I2E4hxQ0N7mTtl45pXEFLsk= =tG0v -----END PGP SIGNATURE-----

create .hg/hgrc with [paths] default entry only if source was given on hg init. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 create .hg/hgrc with [paths] default entry only if source was given on hg init. manifest hash: 8229e52ba4d3a6be51e053986230d195cff78966 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCstisW7P1GVgWeRoRAqaVAJ0SK+3Sjki5OD61bCZj1HEo5hYcsQCfRV0z MJpYg9kiWJg8a4CzASoa+Hs= =Ql0q -----END PGP SIGNATURE-----

Updated TODO -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Updated TODO manifest hash: d56c5efd51558453626e53cb8e5802d7c64cbb2c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCstaMW7P1GVgWeRoRAitJAKCKQ+EE1LBTBu7kMkR6Je0uQSQ4rwCcDTpd D9Yes77z/o00nq0g/kiT+pw= =SFsE -----END PGP SIGNATURE-----

Fixed tests for displaying tags in hg history and hg parents. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fixed tests for displaying tags in hg history and hg parents. manifest hash: 1ff138f68590e11a20e1f375c0c7293bdfb9f1fb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCsp/XW7P1GVgWeRoRAtS1AJ90tbAlt89jZr//nYMEgoVv2UL6GwCgih7L yFwVR4cWpSGyrl0zvYM3AiU= =6OjG -----END PGP SIGNATURE-----

Show tags in hg history etc. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Show tags in hg history etc. manifest hash: 5520d8f5be86d5183c5b6f84e25cb99eb35ad4b7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCsphGW7P1GVgWeRoRAtujAJ97McEv8gL8m1uZz79ufKgbzFf6ZACfd7vQ 49wFPb65oMSwro9XjOoGgCk= =BSsw -----END PGP SIGNATURE-----

Improvements for hg identify: -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Improvements for hg identify: Don't add the modified flag if unknown files are found. Remove extra space if there was no tag found. Multiple tags for a single parent separated by '/'. Getting rid of sum() to aid porting to Python 2.2. manifest hash: f91224afcb239908ba3ef02299fcf2b0380ebd1a -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCspWvW7P1GVgWeRoRAnqbAJwL1DIzOxOrdqpPj9vsYJeeiq+VrQCcCyli P+b/S0s2n628ku1IfrW3Elo= =lgRY -----END PGP SIGNATURE-----

Fixed problems with extra spaces around tags in .hgtags -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fixed problems with extra spaces around tags in .hgtags manifest hash: 2a40f403d5d7d9c4d39e52fa6edefa74d5797167 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCspTvW7P1GVgWeRoRAg9PAJ9OWdUii+qO+U5ioaAbkFeIROA/7gCdGgau ZP8jmI1h95ZK3KS/QlQMeQ4= =lRFd -----END PGP SIGNATURE-----

mpatch: attempt to handle unpack alignment issues on Solaris -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 mpatch: attempt to handle unpack alignment issues on Solaris manifest hash: e185dc380bab61cf11a9973ee3ddd2e904e56299 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsnOtywK+sNU5EO8RAlzQAJ9YIhbL8BJjT+J/pOiQVES2wsF0igCgnFRl ok5f8i8GbNk77sRbpsGnUF0= =m0Zh -----END PGP SIGNATURE-----

hg merge: fix time asymmetry bug with deleting files on update to past -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg merge: fix time asymmetry bug with deleting files on update to past manifest hash: 41feb7bf9b56e071a538a0918224898acb2bd31c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsm6XywK+sNU5EO8RAncbAKCwn/W4cr6civp4Zt79JFH6um0/lQCdFCh8 F7ZOQ+S/PL3HL4iE6avOBDc= =kHPm -----END PGP SIGNATURE-----

test suite: fix timezone problems and port collision problem -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 test suite: fix timezone problems and port collision problem manifest hash: 44652133f49c24679b289c0250eb591682225c54 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsaq7ywK+sNU5EO8RAluQAKCSuUGge7bQPbWbQoIfWETDFRibNwCgs12e /TSLCPJ0aHvqttMhJSaYOSU= =5OYO -----END PGP SIGNATURE-----

Ancestor algorithm fix -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Ancestor algorithm fix The ancestor algorithm was a bit too optimistic about node ordering still. Add revision numbers to the comparison to sort things out. manifest hash: f4eaf95057b5623e864359706dcaee820b10fd20 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsTrCywK+sNU5EO8RAtqMAJ9fEJEesPn+0SMg/i/g5vZYmX/pBgCfVnhl +s88q/Wilw27MVWP6J6oqX8= =k9AU -----END PGP SIGNATURE-----

Merge with TAH -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Merge with TAH manifest hash: 18cf61cc2b6611d74ffc490b6b733537b879d69e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsQy7ywK+sNU5EO8RAoi/AKCC0XbK73oemLr52KOQWEK4WlE9pgCgkk/8 C/m6MZJqlOKhIT4jazPwngU= =ECGy -----END PGP SIGNATURE-----

Updated TODO -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Updated TODO manifest hash: ee511d64271017729839799c4ea066b2046579d9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCsQyGW7P1GVgWeRoRAifOAJ9hUcsM2+OPfjichr083EAhKfMSSACeIhtK d3QXNNmPpmk6lLFFFujImEU= =kCMx -----END PGP SIGNATURE-----

hgweb: missed a long hash -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hgweb: missed a long hash manifest hash: b027f73ea9252f2833525f4885e2aa40e717616d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsQurywK+sNU5EO8RAvfEAKCgUYzKeSzKwGKuyVhnJP+A7UrfMQCgo4BP GAdHa6jMtH+wifOHz7kIfL8= =z0wj -----END PGP SIGNATURE-----

Merge with TAH -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Merge with TAH manifest hash: f73215065ecbcfd9a0d0964de5ed73a392837a56 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsQqNywK+sNU5EO8RAiuOAJ4lL23LcxAkbPHy33snasBgrkhNxQCgkBLO ohB0/EA2dAvQtu5sMSW03D8= =lF8D -----END PGP SIGNATURE-----

hgweb: fix deleted file in filediff key error -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hgweb: fix deleted file in filediff key error manifest hash: f751d213d2d2d49b3631dbe72699554e58ae590a -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCsQOVW7P1GVgWeRoRAvRAAJ9cLxO+QLg6gEnn/0XPZJP1G/8/KQCfdygL b+awDXRJmE0onoNzvzzIcBg= =jDV4 -----END PGP SIGNATURE-----

Show nice short hashes in hgweb -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Show nice short hashes in hgweb manifest hash: c73a8e32a823af7ea7440d1db2b0c022a4366bb5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsQpkywK+sNU5EO8RAmSIAJ40aYEFBi07drKuPLuofXNaUkEFtgCghC9g mG8mmhucbBe4hcZWL0AdG8I= =Khp7 -----END PGP SIGNATURE-----

update tests to reflect new short hash length -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 update tests to reflect new short hash length manifest hash: 7ae99e74333416e8cbf8bc5d518bb5d3c449788b -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsQo8ywK+sNU5EO8RAltAAJ97yqgcTU0eYrQ2vpIq+hrfCfrsVwCggUk4 adIvEe7OzGeG6wn0/aRoQXY= =h8+W -----END PGP SIGNATURE-----

Change the size of the short hash representation -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Change the size of the short hash representation First note that this number doesn't really matter, as we always check for ambiguous short hash ids. Here's the math on collision probability: >>> import math >>> def p(f, n): return 1 - (1 / math.exp(n**2/(2*f))) ... >>> p(2**32, 30000.0) 0.09947179164613551 # with 30000 changesets (BKCVS), we have a 9% chance >>> p(2**32, 65000.0) 0.38850881217977273 # and with a full import from BK, we'd have a 39% chance >>> p(2**40, 1e6) 0.36539171908447321 # we'd like to be "safe" for 1M csets, so 40 isn't enough >>> p(2**48, 1e6) 0.001774780051374103 # But 48 looks good >>> p(2**48, 1e7) 0.16275260939624481 >>> p(2**48, 5e6) 0.043437281083569146 >>> p(2**48, 2e6) 0.0070802434913129764 >>> p(2**48, 3e6) 0.01586009440574343 manifest hash: 24d9f928a463f46708b0e11fb781d5a241851424 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsQoMywK+sNU5EO8RAoBBAJwII9GV6dT9QUOYAk3gZGw9z0JvjACfSI4q IFnTu1F7P5OuLelO1GsM8Bs= =CNWk -----END PGP SIGNATURE-----

Move httprangereader into its own file -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Move httprangereader into its own file manifest hash: 7a856e4024ce5d3d305e23e418a77d3058c74ddf -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsPj4ywK+sNU5EO8RAizKAJ9kbYVAC+iL4cKml14BcwX9okdnJQCgjLAP cWM5/y9FdC3THOC6DkUNic0= =PkL6 -----END PGP SIGNATURE-----

hg push: "default-push" default target path -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg push: "default-push" default target path manifest hash: 368f3a073e172272bac06bf5b2ace78f03ffd3bf -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsPeJywK+sNU5EO8RAuNZAKChSFEUCILHmRJmj3/7EDij3RK31gCdF2qF vQ8+72bbEPmxa3HOTdNliu0= =Nyi+ -----END PGP SIGNATURE-----

revlog: add a children function -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 revlog: add a children function manifest hash: eda39cb99d0df5b3262d97a9e161a8acceb1da3d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsPZ0ywK+sNU5EO8RAiAcAJ9D+y8zQ/Gai7CpTkfTamPFxmvVRACcDRv9 5HkupYyrxslGnGJpELaF1is= =zf1d -----END PGP SIGNATURE-----

hgweb: fix deleted file in changeset key error -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hgweb: fix deleted file in changeset key error We simply point to nullid. This is very arguably the correct thing to do. manifest hash: c16f1c05a087e5d3274cb84dfd09d048430f0495 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsPCdywK+sNU5EO8RAuJzAJ9j2Yn7KHceFxYgKvOd5V4fNNLKmQCfTZ9s jorkRZcX2hdZqRkxM8q8VMk= =+bEb -----END PGP SIGNATURE-----

Add a TODO list -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add a TODO list manifest hash: 6d50020153a16e9f746e65c177b15e44a6110ddc -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsNdNywK+sNU5EO8RAnCMAJ9Km7f0Dx8cccH44R20qqHCuBobpwCeIfuh bBtBTknenXsF4bEo3Z6BOt4= =b/zU -----END PGP SIGNATURE-----

Use errno.EPIPE rather than 32 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Use errno.EPIPE rather than 32 manifest hash: c9cb2fadf7ef4392b2f16b3f76ca2a39964b7ae0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsNNOywK+sNU5EO8RAudrAKCGKfgsHmSLdt5HYpUtX4S/QSFCQgCeKb7M Qld4CLe1M3aktU0tugb51Gs= =1LB7 -----END PGP SIGNATURE-----

hgweb: remove pointless manifest reads -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hgweb: remove pointless manifest reads pointed out by Goffredo Baroncelli manifest hash: 7aa5b93dc73755f02887702d0a01118d91b3b289 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsNK6ywK+sNU5EO8RAhJeAJ9ck6KYdupiuuyXXU5Mr8upx+D/NgCcDJmI y7ZVFQoiaYFoJy+GWQ2zFes= =RHPt -----END PGP SIGNATURE-----

One too many newlines in verbose output showed up in regression -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 One too many newlines in verbose output showed up in regression manifest hash: 184bd0353358ec24c3711420ba3c6745a688ebc9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsMC9ywK+sNU5EO8RAuYsAJ4wCphPRGI5omFy0VkbiQp8OairRwCcDdD2 pAR58+i+urS7MlbaDisCYUM= =Ty7w -----END PGP SIGNATURE-----

test-help: hg copy now shows up in the help -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 test-help: hg copy now shows up in the help manifest hash: f5a8f55f2e87e363c22e1639eef4a919ed028d4e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsMCTywK+sNU5EO8RAg0UAKCtCVRkgxqjfHGIbaz1DTZ+FJgXdQCgrfkq i4W+etRh5HWatXrjw+n7Ppk= =4lE7 -----END PGP SIGNATURE-----

Add hg copy -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add hg copy extend dirstate to remember copies add copy command add copy repo operation write copy metadata with commit manifest hash: 9f42c7b4a2400d35807b5f18c05a31814fa3e375 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsMBTywK+sNU5EO8RAjXpAJ9fvNtTP1A/4veqFWQHcWGro7buyACgoVXz /ngGOFowxS/zGkvUvGavYGQ= =drb1 -----END PGP SIGNATURE-----

run-tests: run tests given on the command line -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 run-tests: run tests given on the command line manifest hash: e0217e478de902d0de7b9a294509718365f1d837 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsL7EywK+sNU5EO8RAiGJAJ92ZB/+N8+XnOt717cuADK9ajQ+lwCfW1LG 02mjQ04uoS0n+D8xi0KX9tM= =d1lZ -----END PGP SIGNATURE-----

Fix another sortdiff cornercase -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix another sortdiff cornercase manifest hash: 32b2d1750689c561c9471fb68a9f3571364399cb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsL6AywK+sNU5EO8RAhaeAJ4zw18vo4oGTvymplKb7olKEeg0aQCfVxX1 2o/PcrE6EeboHpQn5E0Wb/Y= =eENW -----END PGP SIGNATURE-----

filelog: add metadata support -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 filelog: add metadata support To add metadata, we add an escape sequence "\1\n" to indicate that some key:value metadata pairs follow. manifest hash: 9a019d50f8d389b2c16cb46f4eab62c136b70fd7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsJfFywK+sNU5EO8RAl1AAJ9BJPgDWnot5MUdPnzPiNxlyhG0rACfVo10 6q9fGaPUpf8mxefz7G8D0Z0= =1BL6 -----END PGP SIGNATURE-----

hgweb: add file permissions -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hgweb: add file permissions From: Goffredo Baroncelli <kreijack@libero.it> Show permissions in hgweb Tweaked by mpm manifest hash: f11361c6da21f3ba60c5e6a173396754c36efb1d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsHFqywK+sNU5EO8RAoqFAJ44P8kZoZDiY5Fw8LWpL/3ArXNE2QCeO3z4 0zV5rXWa/r/xgf+AVTLeQ/4= =FzLj -----END PGP SIGNATURE-----

[PATCH] manifest.readflags performance buglet -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] manifest.readflags performance buglet From: Chris Mason <mason@suse.com> Performance buglet in manifest.readflags: only re-read the manifest when the mapcache is not present or does not correspond to this node manifest hash: 188ad778308a2e5c885d452d7b7e61c082e8ceb2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsG4wywK+sNU5EO8RAv+IAJ9sU87MythE/HYf3wH/V7ctzNdR1gCfclr9 ydsk6wtk/n6uKb4U7BvGvLM= =5cOx -----END PGP SIGNATURE-----

[PATCH] Update hgit to the new commands.dodiff parameters -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Update hgit to the new commands.dodiff parameters From: Chris Mason <mason@suse.com> Update hgit to the new commands.dodiff parameters manifest hash: aa8d98036fae49ab1c1c0e65d86ab0e1bee0fa71 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsG35ywK+sNU5EO8RAhnoAJwMgK1QA8DkdbU2R19LoLRK1fmCaQCeN1dh 4fHRT4hf+Qi5fND4CpOyqBU= =63xo -----END PGP SIGNATURE-----

hgit rev-list support -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hgit rev-list support From: Chris Mason <mason@suse.com> Update hgit rev-list support, make it a special case of hgit rev-tree Print newest commit first Add the ability to specify the max number of commits to print (-n or --max-nr=) Match git feature of stopping at a given commit (hgit rev-list start_commit sto\p_commit) manifest hash: b9bbd5e95dae771ebef89f8f4102e458052b1835 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsG26ywK+sNU5EO8RAm5OAJ46G1nhXN2kQ+cKaBOK+oX4zSdQRgCdECvG 6wbG0JRdm7S29K4ynzs4cyY= =pwpz -----END PGP SIGNATURE-----

hg import: better file accounting -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg import: better file accounting From: Chris Mason <mason@suse.com> Change hg import to call hg addremove with the file list to make sure files added/deleted by the patch are properly accounted for. Instead of using lsdiff, the output of patch is parsed directly to find the file list. manifest hash: defed8cb90d6f976fb47949ac03dc4b88870ba77 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsG1BywK+sNU5EO8RAvV9AJ9H25L5vdnZB1xpAakuN3tGuMfRfgCfdAgP 3xBc3S4F74/7DdS2GXRNhGw= =oXXT -----END PGP SIGNATURE-----

hg commit: add -A flag -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg commit: add -A flag From: Chris Mason <mason@suse.com> Add hg commit -A that calls hg addremove before trying to run the commit manifest hash: d25cb3ab4e0dc2e8642bcbef32da4ab178cd4823 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsGzrywK+sNU5EO8RAvdFAJ46ZjyACMvKEUq8RmdxZB9ZE0z6ygCfYYzq UP2EXTOQ2pdhxKFyad8h/Rg= =wzZD -----END PGP SIGNATURE-----

hg addremove: take optional files list -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg addremove: take optional files list From: Chris Mason <mason@suse.com> Change hg addremove so that it can take a list of files to process instead of searching the entire tree for candidates. manifest hash: 592d8771ea5703dd6ed4459239dab84e15ee9321 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsGyqywK+sNU5EO8RAt0jAKCSDQ1fxgQNP08kehdxlQwX5DUuuQCgqRB2 7gZoRNyJmOy5BVp6VBmUJbw= =THQB -----END PGP SIGNATURE-----

ignore files associated with quilt -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 ignore files associated with quilt manifest hash: f0da2c0465fb27005d5bde30e0171ae9a76951d0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsGpIywK+sNU5EO8RAi+uAJ4/cXWFBnXoLHH8bN8Xbe/nzXHycgCfQkO2 WdEoWI4YpiNQ+s5id6Xxphw= =6cXJ -----END PGP SIGNATURE-----

hgweb: change number navigation tidy up -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hgweb: change number navigation tidy up manifest hash: 9fe0ad4fba9a7a0d4c604299024ce7732198c831 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCr+vkywK+sNU5EO8RAiOyAJ92O9ALuJTbVPPGC/x6vL6yK7GggwCgs4ta 5StdA4D/dOEUvN6O3xicKhk= =fP4C -----END PGP SIGNATURE-----

Merge with TAH -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Merge with TAH manifest hash: ec82cc2d7b7357fd7db4917e09d7d6865482de58 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCr+f1ywK+sNU5EO8RAuPtAJ0WilDBo3iG4S/dmIabhzYW987TtgCgkjkM 8OmatsrjG01iJAhkKJj+XnQ= =mOLr -----END PGP SIGNATURE-----

Merged with mercurial-identify (which includes upstream's current tip) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Merged with mercurial-identify (which includes upstream's current tip) manifest hash: b135d201757b84bbe7f14a446d2b001fd0cc1aa2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCr9mNW7P1GVgWeRoRAmTjAJ919wnvZXbKI27N0cDJCrumR3z4rQCcD6PO yZTmrT6p+gt6GBO+j5FVBn0= =HWn8 -----END PGP SIGNATURE-----

Improved hgeditor: -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Improved hgeditor: hgeditor now uses $EDITOR and sets options according to emacs/vim/... Cleanup of temporary files. Use simple 'hg diff' instead of calling it for every file. Call gpg only if commit message was changed. manifest hash: 5c56bf580f9c2ef2a7d8b680bfb73fdd3b232044 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCrowgW7P1GVgWeRoRApiOAJ0UI9/OY3yr4bv0no+KCcponSq+ZwCdFDUU No8t9ni6/72zmlcpB13E63A= =oSyb -----END PGP SIGNATURE-----

Cleaned up show_changeset() -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Cleaned up show_changeset() manifest hash: f9aa30cfa465d7aa096abb652ec04f1a5ec1072f -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCroC+W7P1GVgWeRoRAuheAJsEx7eFaoHoz+YejLIiN4BSfE117ACfYdM6 NQGNTp3ftUSuVpcMLvV8A1U= =8Ihb -----END PGP SIGNATURE-----

merge3: fix argument order -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 merge3: fix argument order We were passing the wrong argument order to hgmerge. Add a merge conflict test case. manifest hash: 2d88786a3f31dcaa9d44f564c21f0d2a4f14f09c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD4DBQFCr+ZoywK+sNU5EO8RAouJAKCOx5oxhVXkLqsfCPBXx0+wP5IeogCYoZzF ooZT2fyN3tL3uVM2YP8KcA== =O4fE -----END PGP SIGNATURE-----

Add a tags/identify test group -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add a tags/identify test group manifest hash: 25c43d62cea41cddad1c2f1c82c44f0ac1841fca -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCr+JqywK+sNU5EO8RAtqxAJ0bgpL+W1fk8NH9s1eLH6AgM/EXQQCfaOy8 B6L71BwVMcuPukHb3MEtFnQ= =gwew -----END PGP SIGNATURE-----

Fix yet another resolve corner case -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix yet another resolve corner case manifest hash: a194321b5cd718a3c31f327c5145a4ebd8dd4ef4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCr+IvywK+sNU5EO8RAt49AJwLBBq7AZfo1WqcwZvzSVENvJGLmgCePumQ 0/9RwjL/PorsvFJi+CiFYyY= =S6HA -----END PGP SIGNATURE-----

rework all code using tags -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 rework all code using tags Add three utility functions: tags(): get (and possibly load) the tags mapping tagslist(): sort tag,node by revision (aka topologically) nodetags(): return a list of tags associated with a node (also cached) Update all the code using tags to use these. Simplify identify code make unknown always visible if printed don't ignore tip pseudo-tag manifest hash: e6deb4d545ad465be7735f9ec43227bcb5e238c7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCr+HjywK+sNU5EO8RAh4/AJ90cI0WxmvQAj6Lq2ZiG8LmqZan/QCfR8B5 ltu8tOIEHDa8LhfS9wtBu0k= =pv3t -----END PGP SIGNATURE-----

update help test for identify -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 update help test for identify manifest hash: 38a41136c79411b0c926f93c54684a0716c11d68 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCr+DNywK+sNU5EO8RAjDoAKCv6JGj9TkDtu3cn82zjlWyUJvfUwCcCh/u LPzNYK6Cy29IZ4TKApmPUoQ= =edY/ -----END PGP SIGNATURE-----

run-tests: actually mark changed output as failure -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 run-tests: actually mark changed output as failure manifest hash: d657fbfb2f3bcf24038f20b17d776248e4b63b6b -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCr+CFywK+sNU5EO8RAhNnAKCa7xzxe4JEktfysqHIcerhwhtmnQCgsPgI PDh6sYNfpsfNjFzrqYCh5A4= =SOg/ -----END PGP SIGNATURE-----

Handle the case where the current working copy is not based on a checkout. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Handle the case where the current working copy is not based on a checkout. Print 'unknown' in verbose mode and nothing otherwise. manifest hash: 5742c3c3a762b77ee1aeb62ed53b8f2d8e47a05d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCr8WJW7P1GVgWeRoRAtNkAJ9Qea4u8GG8zdSk87qLApT88KMrgQCeO22w bJ12ieVHvLzc2NNAGV+zbeQ= =IYni -----END PGP SIGNATURE-----

added hg identify|id (based on a patch from Andrew Thompson) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 added hg identify|id (based on a patch from Andrew Thompson) manifest hash: b8f801efb6cf14a6d754fed2cf47149f4e77b3cc -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCr8BLW7P1GVgWeRoRAj3+AJ4jIvfBnu6vbF+SOS2ybVTboXe7pACfZkkT 2G2bbxYowVnrytOXVg6BhlU= =wNpZ -----END PGP SIGNATURE-----

default path support with .hg/hgrc -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 default path support with .hg/hgrc hg init creates a new .hgrc file containing a default path pointing to where we pulled from. hg pull now uses "default" as the default source. manifest hash: 0908e3b0648f92a63a3b58e49107cedf07ca0fb4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCr5SBywK+sNU5EO8RAmvRAKCPdItvtxYyAOgG24732J7PZMFnVgCfe21B MoilYzCQi5GOswS2mk0aE6M= =Gude -----END PGP SIGNATURE-----

Add support for .hg/hgrc file -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add support for .hg/hgrc file manifest hash: a6d2fc7ed8d56e2f0d65aad78a4d8359898ca246 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCr5QZywK+sNU5EO8RApnlAJ9nD65i2aEQcljV+Y39zgImpcdtgwCgpT9G O2D8FDFpRNyYki/QPt5e/AQ= =bQCZ -----END PGP SIGNATURE-----

Add some more tests -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add some more tests manifest hash: 0e357a0d32baee877f2c7b6c6a8f7468e4b7f1b5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCr4TQywK+sNU5EO8RAoZ1AJ9lbLIN2uwLWpVOilQs9CkyFIaQ5wCeKToO 1HXJVrlhexgIzwSnBkTBNOo= =UJ+y -----END PGP SIGNATURE-----

Fix misrecognition of commands -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix misrecognition of commands manifest hash: e8a19b922c3129c37050589edfb83d742c08a808 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCr38xywK+sNU5EO8RApRbAJ9CcBFI5MQiilZZaucVGX84tyFwvACfaYL1 tgI+dsdbAAiFhW8eEPYX7ts= =Zu9L -----END PGP SIGNATURE-----

hgit: remove tabs -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hgit: remove tabs - From Chris Mason manifest hash: 68e016c1bbaaebed60ab9755fd054b95dae7263a -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCr1RfywK+sNU5EO8RAjWBAKCMhIYjj/wOIvztLyoOjeuKMSSvLgCePIuD Mm44JPLF9xegWFyOgB7QVoA= =eEHJ -----END PGP SIGNATURE-----

hg rawcommit: fix files arg conflict -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg rawcommit: fix files arg conflict I try to sync with tip again. I found out the raw commit is broken for me because the keyword "files" is list as named argument as well so it will not show up in the rc dictionary. Here is my quick fix to make it work with my script again. Chris manifest hash: 10f85636e02cb4b19b319b7ebbfd2ec5096c3a6d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCr1HSywK+sNU5EO8RArWMAJoD67SPN4QJcVaHBVh9FiNXWy80FQCePpA/ BZ63h+bqXESeMMLb7Kh5ytA= =69X0 -----END PGP SIGNATURE-----

testing fixups -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 testing fixups Add note about running tests to README Fix issue with pipelines and set -x output stability Add note about stability issue to README manifest hash: 7e8d9da463b3110664e24978550faab3ef67a706 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCr0/FywK+sNU5EO8RAnWXAJ4toFrvgtsPfR3dYs9a81AsOrfiVQCfZKIf yJCboAnoJNSSjyUk42ALMxs= =YJ31 -----END PGP SIGNATURE-----

Add a simple testing framework -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add a simple testing framework manifest hash: 9eeea72f2f33438040998a190183958764232ece -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCr0wKywK+sNU5EO8RAl9FAJ4o1QUA/YE2hCSlUPngR8h30hT1xQCgoEhu um2QkJOc2Rz7i6xTGPxuqzU= =YyUM -----END PGP SIGNATURE-----

Merge with TAH -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Merge with TAH fixup history messages to not interfere with GPG signing manifest hash: aea3a92e4699dfe0cbd98e6e2c8c6971218a59b8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCrkK4ywK+sNU5EO8RAqxHAKCNyjTE5F/7EvM+ipjhgzIUk1aWZACgm7zz eBcKlHcOA8ceUcn4IEBLQpM= =YfHT -----END PGP SIGNATURE-----

Use common output function show_changeset() for hg heads|history|log|tip. show_changeset() uses functions from ui.py instead of print.

hg pull: more query fixes -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg pull: more query fixes Pull was getting confused by single-element branches because it had seen the top end already. Also, the previous change to do seenbranch on the base of the branch was bogus. Minor cleanup and a bit more diagnostics in the branch-narrowing code. manifest hash: 71d4dced9f74bef43d3a54d086dccd0a96d68e26 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCrjLgywK+sNU5EO8RAsxSAJ92U31Pz7K14Ctje4SEec2857Ut7QCgoVwY ho65mloslCSidLsEnxYfBDI= =Wts9 -----END PGP SIGNATURE-----

Tweak README for branch, push, and .hgrc -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Tweak README for branch, push, and .hgrc manifest hash: f1937ad49013e7e40e6555f2acf1210563e6a96d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCrhBSywK+sNU5EO8RAr0OAJ9T+DcMcIvXp9ajI46kXM40GuHosgCfRxfY 8uhwZqdaR0JWlWff0nC6t1Y= =3I60 -----END PGP SIGNATURE-----

mdiff: fix the fix -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 mdiff: fix the fix I saw you check in the thing back in but with another typo. You check in "la < lenb", should be "la < lena". So we are even :-) Chris manifest hash: 57157502250b0120bcc12a75a530d4c133673b39 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCrg5tywK+sNU5EO8RAvLPAKCOs76LKPniKHFa15YwzWWsNZ5/xACfesl3 WCiUjdeYUtU3jVKCEwmjAT0= =+GFy -----END PGP SIGNATURE-----

mdiff: reinstate new algorithm -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 mdiff: reinstate new algorithm This unreverts the new algorithm with a fix from Chris (s/len/lena) and adds some comments on what it's doing. manifest hash: 75fc1acee1926e57d495f67a44cd88d9555f2356 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCrf4UywK+sNU5EO8RAoRzAKCA2vpUAGNqTkDeba3YHo6XXht7VgCfXQK0 /j5yv5cucnsYezCdclpftOA= =FNMD -----END PGP SIGNATURE-----

hg merge: some getchangegroup fixups -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg merge: some getchangegroup fixups - - filter more duplicates - - request batching - - lookup ordering - - request counting After these fixes, grabbing 1800 changesets on top of the 28k changeset kernel history takes 23 round trips rather than a couple hundred. manifest hash: 78e893b68000267a8c7ea49fd38758f2fc96269f -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCrea0ywK+sNU5EO8RAv3cAKCQveivdApJIlslTCMLMp2VogRXfACeNRnx Ihsf5yLz60fFpqlzAmZBACk= =Euku -----END PGP SIGNATURE-----

lazyparser speed ups -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 lazyparser speed ups When we do __contains__ on a map, we might as well load the whole index. Not doing this was slowing down finding new changesets quite by a factor of 20. When we do a full load, we also attempt to replace the revlog's index and nodemap with normal Python objects to avoid the lazymap overhead. manifest hash: 9b2b20aacc508f9027d115426c63a381d28e5485 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCreYIywK+sNU5EO8RAoNHAJ9+LmXqsTQb9Bh3mZHq0A0VfQOleQCffHmn jC/O0vnfx5FCRsX2bUFG794= =BDTz -----END PGP SIGNATURE-----

hgweb: Fix reloading of index -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hgweb: Fix reloading of index We were reloading every request because we weren't saving the old mtime. manifest hash: 507330727957ff53c48b38f427f0b70469a49271 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCreVpywK+sNU5EO8RAp/YAJ9cXh2II4DGAQtRc58yj4hi49C8jgCfT7bV 22w73T2FiYBjzMk8N8STUVI= =eghX -----END PGP SIGNATURE-----