ssh: skip noise generated by remote shell we send a dummy command with known output to get in sync

work around python bug on solaris 10. write to file opened mode 'a+' should write to end of file and update offset pointer, but does not (solaris 10 has python 2.3.3). fix is to always seek.

more windows fixes.

clean up lee's windows testpid fix.

Fixes to testpid() for Windows. Handle processes that no longer exist and processes that belong to another user. Enables the lock breaking changes from d314a89fa4f1 and subsequently "fixes" the left over locks reported in bug 112.

Use [ x = y ] instead of [ x == y ] in shell scripts.

New option -i/--ignored for 'hg status' to show ignored files. localrepo.changes() now returns an additional list of ignored files if it is called with show_ignored=True.

Fix hg push and hg push -r sometimes creating new heads without --force. Fixing issue179. The algorithm checks if there not more new heads on the remote side than heads which become non-heads due to getting children. Pushing this repo: m /\ 3 3a| |/ / 2 2a |/ 1 to a repo only having 1, 2 and 3 didn't abort requiring --force before. Added test cases for this and some doc strings for used methods.

merge with crew.

add merge command. means same thing as "update -m". repo.addchangegroup method now returns number of heads modified and added, so command line can tell whether update or merge needed. this makes tiny change to ssh wire protocol, but change is backwards compatible. pull command now returns 0 if no changes to pull.

merge with crew.

merge with crew.

fix backtrace printed when cannot get lock. change lock error handling code so exceptions have useful info and exception handling in one place. add test case for when cannot get lock.

Catch HTTPException when reading from remote http repository. If the server dies very early, an httplib.IncompleteRead exception may be raised, because httplib can't read a single byte. Catching all HTTPException subclasses here will prevent ugly backtraces for similar things, too.

merge with crew.

Fix error on Windows if "hg log | more" exits.

add missing filename title to gitweb's filelog page

don't overquote description on gitweb summary page (issue 184)

fix appendfile problem on macos. when i open file with mode 'a+' on linux, seek position is 0. on macos seek position is end of file instead. not documented.

Fix broken hgignore tests due to full path showing up in output.

Don't ignore everything if all hgignore files are empty.

show committer's name on gitweb's summary page (issue 137)

Show reason why an ignore file can't be read and state that it is skipped.

On error parsing hgignore file, print the correct filename.

Add warning if user-configured hgignore file isn't found

Implementation of per-user .hgignore. Reference: http://www.selenic.com/mercurial/bts/issue166 If the [ui] section of .hgrc contains keys like "ignore" or "ignore.something", the values corresponding to these keys are treated as per-user hgignore files. These hgignore files apply to all repositories used by that user.

Calling revlog.addgroup with an empty changegroup now raises RevlogError. The empty changegroup can be caused by remote servers dying soon after findincoming, and further code in pull assumes (correctly) that there are new changesets.

Windows py2exe version didn't handle names given to templatepath() correctly

add benoit's test for issue148.

forgot to add new module.

fix race in localrepo.addchangegroup. localrepo.addchangegroup writes to changelog, then manifest, then normal files. this breaks access ordering. if reader reads changelog while manifest is being written, can find pointers into places in manifest that are not yet written. same can happen for manifest and normal files. fix is to make almost no change to localrepo.addchangegroup. it must to write changelog and manifest data early because it has to read them while writing other files. instead, write changelog and manifest data to temp file that reader cannot see, then append temp data to manifest after all normal files written, finally append temp data to changelog. temp file code is in new appendfile module. can be used in other places with small changes. much smaller race still left. we write all new data in one write call, but reader can maybe see partial update because python or os or filesystem cannot always make write really atomic. file locking no help: slow, not portable, not reliable over nfs. only real safe other plan is write to temp file every time and rename, but performance bad when manifest or changelog is big.

Added missing gettext import to changegroup.py.

Don't mention deprecated HGEDITOR variable in the help text of commit.

Spelling fix: "commited" -> "committed"

show message if no changes found on outgoing Now the messages for pull/push/incoming/outgoing should be consistent.

show message if no changes found on incoming

Include templates/static/* in MANIFEST.in so that distutils setup will include them.

merge with self

make it possible to escape characters in a glob expression

ignore EPIPE in ui.err_write It avoids not being able to abort a transaction when a push via ssh fails. Maybe some other place should ignore EPIPE too.

merge with crew.

add changelog style to command line template. to use, "hg log --style=changelog". makes different output with no flags, -q, -v, --debug. templater module has new template filters for this. email - committer email address fill68 - refill text to 68 colums fill76 - refill text to 76 colums tabindent - prefix every not empty line with tab shortdate - iso 8631 date, no time zone stringify - turn template iterator into string

add checking for invalid entries in tag files safely parse the differents tag files, output warning when parsing an invalid entry.

Adapted behaviour of ui.username() to documentation and mention it explicitly: Searched in this order: $HGUSER, [ui] section of hgrcs, $EMAIL and stop searching if one of these is set. Abort if found username is an empty string to force specifying the commit user elsewhere, e.g. with line option or repo hgrc. If not found, use $LOGNAME or $USERNAME +"@full.hostname".

Improved ui.edit(): - Use descriptive name for temporary file: hg-editor-*.txt - Don't import tempfile in the method, but use demandload() - Remove tempfile file even if editor aborts.

Pass correct username as $HGUSER to hgeditor if "commit -u" is used. And only use the new util.system parameter to set the environment.

Added test for incoming via ssh.

make incoming work via ssh (issue139); move chunk code into separate module. Incoming ssh needs to detect the end of the changegroup, otherwise it would block trying to read from the ssh pipe. This is done by parsing the changegroup chunks. bundlerepo.getchunk() already is identical to localrepo.addchangegroup.getchunk(), which is followed by getgroup which looks much like what you can re-use in bundlerepository.__init__() and in write_bundle(). bundlerevlog.__init__.genchunk() looks very similar, too, as do some while loops in localrepo.py. Applied patch from Benoit Boissinot to move duplicate/related code to mercurial/changegroup.py and use this to fix incoming ssh.

use HG10UN header for uncompressed bundle - use HG10UN instead of HG11 for uncompressed bundles header - check HG10BZ for compressed bundle - better error handling for invalid header some notes: - people who created uncompressed bundle will no longer be able to use them (it could be fixed with hand-editing) - older hg cannot detect an uncompressed bundle (bzip2 decompression will fail).

More detailed documentation about ssh:// URLs; fixes issue170.

do proper typecasting on malloc() and calloc() calls to support build on Solaris 2.6 using Sun Pro SC4.0 (C++ 4.1) compiler.

Don't forget version at the end of setup.py, write it only if changed. This fixes issue159: "python setup.py install" shouldn't write new files in the working dir if one has done "python setup.py build" first.

Enable path validation for copy, rename, debugwalk and other canonpath users. This fixed the last bit of issue134. Added some tests to test-rename and test-walk.

Duplicate cache when creating templater.

Delete bundle file of hg incoming in case of errors, preserve existing files. Let write_bundle always create the bundle file, check if target doesn't exist and delete it in case of errors. This way incoming only has to delete the bundle file if it was meant to be a temporary file.

Cleaned up the code path for bundle handling in hg incoming, updated comments.

Documented behaviour of write_bundle regarding file handles.

imported patch /home/thomas/fix-incoming-abortion4.patch

Fixed abort while remote incoming command on windows.

write_bundle: close the file before removing it in case of failure

merge with crew.

still use old variable names when running hooks. dropped by accident. we set HG_FOO (new name) and FOO (old name). plan is to drop old names after 0.9.

hg status cleanups: Don't translate long options, remove stray semicolon.

add remotecmd/ssh option support to incoming/outgoing

fix template bug that made hgweb break. problem found by Shun-ichi Goto <shunichi.goto@gmail.com>. this fix tested with command template and hgweb templates.

Don't require the "yes" command for test-merge5.

tests: more portability fix for the old systems

merge with crew.

update test for unrelated repo.

add -f/--force to pull, incoming, outgoing, to work on unrelated repo. before this, push would not push from e.g. "hg" repo to "kernel" repo but other commands worked. this was bad idea, could merge unrelated projects by accident. i did this tonight. now, all commands still work with unrelated repo but need --force/-f. abort is default. this is safer.

merge with crew

merge with crew

use a proper test instead of catching every exception

Fix the py2exe template path problem (issue:152) again. This patch is same with 1834:24881eaebee3 which is leaved behind by 1897:58b6784cf9f1.

merge with crew.

change default strftime format for better portability On some systems, such as Solaris and HP-UX, "%c" format give output without the leading zero on the single-digit month-day.

tests: fix portability issue for echo -n

add HGRCPATH env var, list of places to look for hgrc files. if set, override default hgrc search path. if empty, only .hg/hgrc of current repo read. for each element, if directory, all entries in directory with end in ".rc" are added to path. else, element is added to path. big thing about this change is that user "~/.hgrc" and system hgrc not longer breaks tests. run-tests makes HGRCPATH empty now.

hgk "committer:" bug I've been having an hgk problem with this tree: http://xenbits.xensource.com/ext/linux-ppc-2.6.hg, specifically changeset 93c590d23a53. The problem seems to be that the commit message contains a "committer:" line, which triggers a (relatively unused?) case in hgk.py... Both cases need the dates at the end of the line.

tests: add bunzip2 to prerequisite list

merge with crew/templates

fix the call to util.matcher (the args should be (reporoot, cwd, ...))

bundlerepo: remove relative import, fix a comment

new type of repo: bundle://path/to/repo+/path/to/bundlename You can use it to pull only some changeset from an uncompressed bundle.

incoming: add support for remote repo using bundlerepo

refactor the bundle writing code, since we will reuse it later

add bundlerepo.py: a read-only repo that can use uncompressed bundles The idea is to create a repo consisting of a normal local repository plus all the changesets contained in a bundle. The bundle needs to be uncompressed. A futur version could implement the seeking through a compressed bundle.

revlog.py: factorization and fixes for rev < 0 (nullid)

add a new bundle type: uncompressed bundle

Use timestamps without leading 0 in test-command-template for portable tests.

merge with crew.

fix use of python 2.4 features.

Make test-remove portable for strange strftime implementations (second try). I forgot to replace the date output for 'hg log -p', too.

Removed obsolete workaround for error message in tests/test-static-http.

Make test-remove portable for strange strftime implementations.

Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Some systems show "Thu Jan 01" instead of "Thu Jan 1", which breaks tests. Using "1000000" yields "Mon Jan 12 13:46:40 1970", which looks the same on all systems.

Merge with http://hg.home.dataloss.nl/hg-portabletests

merge with crew

merge with crew

Merging with crew.

clarify license on md5sum.py

add http_proxy= lines to test-bad-pull and test-pull

changes by John Levon to standardize some erroroutput

small solaris portability fixes from John Levon <levon@movementarian.org>

add md5sum.py required by fix in previous changeset

fix testsuite for freebsd and one timingissue

ui: output the number of file updated/merged/removed/... on update add a note for people to remember commiting after a merge.

Don't expand empty [paths] so later interpolation can do the right thing. Example: [paths] default = default-push = %(default)s

merge with crew.

add changeset_quiet to templates.

fix template tests.

add quiet and debug template keys.

fix test failures that depend on when tests run.

add tests for command line template. fix default template problem found in test.

make --style=compact look for map-cmdline.compact. change name of key in map file from changelog to changeset. rename command map files to start with map-cmdline. rename ui.logmap to ui.style in hgrc. now --style=foo does this: tries to open foo as file. tries as map-cmdline.foo in template path. tries as foo in template path.

fix some things people wanted to be cleaner. rename --map-file to --style. no more -t alias for --template. update docs. rename template entry in map files to changelog. if --verbose, use changelog_verbose if there, else changelog.

hide some functions behind lambdas, so demandload is useful.

add extra newline to verbose log template. asak found this.

changeset_templater: only compute manifest when --debug.

add doc comments to template code.

print tags in compact template.

let commands that show changesets use templates. mechanism is same as hgweb templates. old show_changeset code is still used for now if no template given, because it is faster than template code when verbose or debug. simple template can be given on command line using -t, --template. example: hg log -t '{author|person}\n' complex template can be put in template map file, given on command line using --map-file. we give two example map files: map-log.compact prints 3 lines of output for every change. map-log.verbose prints exact same output as default "hg log -v". map files are searched where user says, then in template path as backup. example: hg log --map-file map-log.compact defaults can be set in hgrc with ui.logtemplate and ui.logmap.

add iso date template filter.

improve template errors when something is wrong.

improve templating. allow {foo} as well as #foo#. add new functions for changeset authors.

move shortuser into util module.

make parsestring work with strings that do not have quotes.

use safer string parser for template engine.

move repeated work out of inner loops.

many small changes to templater. get string code to parse escapes. uses eval now, should parse strings itself soon. let caller check if fragment is defined using "in". make templatepath take optional file name.

missed hunk when moving code to templater module

move hgweb.templatepath into templater

move hgweb template code out to templater

findincoming should return an iterable

Allow symbolic path names in global -R/--repository parameter.

Read paths specified in .hg/hgrc relative to repo root, otherwise to home dir.

Directory names take precedence over symbolic names consistently. Previously this was only done for clone.

New version/release in mercurial.spec, patchbomb is now in hgext.

fix contrib/mercurial.spec for hgext

Try to import extensions from the hgext module first.

Make bash_completion more robust for e.g. broken hgrc or old hg installations.

new command debugcomplete add a new command debugcomplete, it lists all the possible completion for the specified command. make the bash_completion script uses it instead of the awk code

remove bashisms from tests

run merge program in repo root. before, merge program was run in user current directory. Well defined location is better for scripts. no more need to pass HG_ROOT to merge program now.

merge with self.

give more info to hgmerge script.

merge util.esystem and util.system.

undo edit that was accident.

fix broken environment save/restore when a hook runs. move "run commend with different env/cwd" code out to function in util. new function is called esystem.

make clean now removes generated documentation.

Make #!/usr/bin/env python in test-bdiff run the specified python version.

change lock format to let us detect and break stale locks. old style: symlink to pid new style: symlink to hostname:pid if lock code finds new-style lock, it breaks lock if locking pid is on same machine and pid is not alive. otherwise, lock is left alone. this makes locking code safe with old-style locks and with locks on other machines. new code makes server part of mercurial more robust in case machine crashes, power fails, or crazy user does kill -9.

Catch hgrc interpolation errors nicely.

Catch other exceptions (e.g. util.Abort) in parse(), too. This has the benefit of removing duplicate catching of AmbiguousCommand and UnknownCommand, and keeping all exception handling together.

Inherit config from real parentui and don't use ConfigParser internals. Added comments for the meaning of parentui.

Added check for minimal python version to setup.py

merge with crew.

patchbomb: ignore exception if pager quits.

make push over http print good error message.

Reordered options for remove, fixed synopsis for rename.

merge with self.

add -f/--force to remove command. else to remove modified file, must use "hg revert; hg rm" or "rm; hg rm --after".

inherit hgrc so "%" interpolation works.

merge with crew.

Fix manifest view on Windows

Removed script header from mq.py

Moved bisect extension to hgext folder.

Added copyright information to hbisect.py

Merged tah and crew

Moved --cwd handling in front of -R handling again. Shorter code for initial -R.

Make hg paths and hg debugconfig work with -R/--repository option. Commands that can use a repo, but don't need one, should be added to the "optionalrepo" string, similar to the "norepo" string.

Always try to open the repository if -R/--repository is specified. This makes 'hg -R something_unknown command' consistently fail for all commands, not only for those who need a repository.

Make bisect extension work with python2.3

Fixed spacing/indentation, removed #! script header, added short description.

Fixed contrib/hbisect.py to work with the new opener behaviour.

Fix some problems when working on broken repositories: Fix tracebacks in hg verify for certain repo errors. Print compression type byte encoded safely.

Fix mq's usage of opener, which don't allow absolute paths now.

merge with crew

Hide debug commands in ambiguous command list, unless no normal command matches. This will execute diff if 'hg d' is typed and hide rawcommit on 'hg r'. Based on a patch by TK Soh.

Show ambiguous aliases, if they are not simple abbreviations. Sort output.

show choices on ambiguous commands

fix annotate for removed files walk in the manifest files instead of the working dir files when running annotate

only put numbers on patches if > 1 patch.

Patchbomb only sends introductory message [0 of N] if there are multiple patches.

Remove patchbomb from list of contrib files to install since it's now an extension. Innosetup script was referencing old contrib location. Also cosmetic change to group related files.

Removed PKG-INFO from repository, because it already gets auto-generated. Canonical place for changing the contained info is setup.py.

merge with crew.

Fix py2exe packagescan problem with new demandload

Merge with crew

Create local ui object per repository, so .hg/hgrc don't get mixed. This is needed for hooks, but may be important for other settings, too. Fixes issue113, also integrated push-hook-lock.sh as a test case for this.

Call hooks in alphabetical (=defined) order, of course still grouped by type. Output of test-hook adjusted.

make ui flush output. this makes error happen if printing to /dev/full. before this change, error happened with some pythons, but not others. now always happens. fixes issue 155.

make lock module use demandload.

Validate paths before reading or writing files in repository or working dir. Fixes security relevant issue134.

Fixes running 'hg serve' with Windows executable and no explicit template path configured. PY2EXE executables don't support __file__ but do place the directory of the shared code library into sys.prefix. Fixes bug 152.

i made a mistake in last change.

generate profile even when exception raised. otherwise, is not possible to profile hg serve.

merge with crew.

merge with crew.

hgwebdir: export collections of repos now you can use [collections] section in hgweb.config to export entire tree of repos.

merge with crew.

get patchbomb extension to use demandload. speeds up hg startup by 50%.

rewrite demandload module to be more flexible. performance not affected. old demandload module could only import top-level modules like os and sys. with rewrite, all of following syntax is emulated perfectly: import foo, bar foo bar import foo.bar.quux foo.bar.quux from foo.bar import quux, blurfl foo.bar:quux,blurfl only thing missing is "import foo as bar". also, namespace clashes between placeholder object and demand loaded module are no longer possible.

Make hgweb.staticfile() more secure and portable. Without this, files in directories next to the static directory starting with 'static' could be retrieved, e.g. with '../static.private/foo'. Additionally staticfile now generates platform specific pathnames from the /-separated paths given in the URL. Illegal file names (e.g. containing %00) now yield a sane error message.

merge with crew.

merge with crew.

copy/rename to a removed destination file When the destination of a copy or rename operation has been marked for removal, we need to restore it before we overwrite it with the new content. This also handles the case of idempotent renames, i.e. hg rename "a" "b" hg rename "b" "a"

Catch urllib errors for old-http in a nicer way.

Really fix bash_completion on Solaris. Maybe. Hopefully. Use substr instead of sub.

Regenerate hg.1.gendoc.txt if commands.py changed.

Make the deprecated rawcommit an alias of debugrawcommit. This way it doesn't show up in the non-debug help.

Ignore generated documentation

Updated help synopsises and reordered some options. Dropped [-n] from revert.

merge with crew

generate hg manpage from commands.py docstring gendoc.py is a script generating a part of the manpage (the commands help and options) from the docstring in commands.py. It avoids duplicating the doc between the doc/ directory and the docstrings. To generate the manpage, 'make doc' will create all the necessary intermediate files.

Merged automatic doc generation from tonfa.

fix the synopsis of some commands, mark rawcommit as deprecated in short help

resync commands.py docstrings with hg.1.txt

Whitespace, tab and formatting cleanups, mainly in mq.py

Updated test-commit to match changed output caused by nested transactions.

Add mq extension

Allow repo lock to be passed in to localrepo.commit for performance

Automatic nesting into running transactions in the same repository. This associates a transaction handle with a given repository object, and any additional calls to start new transactions reuse that transaction. For the 2700 patch import run, this brings the system time down from 1m20s to 50s, mostly by skipping backups of the dirstate file. (note, this patch does not change hg import to use the nested transaction, mq is the only user right now)

Fix bash_completion on Solaris TK Soh noticed that the awk that ships with Solaris doesn't allow you to define new functions. According to http://www.shelldorado.com/articles/awkcompat.html it looks like it also doesn't have some other stuff that we were using, like deletion of an array element and gsub. Rewrite the parsing of hg --debug help to work around that. This version doesn't filter aliases that are simple abbreviations for debug commands (not a big problem, since there are none right now).

refactor the dodiff optimization

speed up hg log --patch Changing dodiff to read the manifest/changelog for node1 before calling repo.update allows us to take advantage of the revlog revision cache. Before this patch and my previous "speed up hg log --debug" patch, when using hg log -p to display three revisions (A, B and C), dodiff and repo.changes would end up reading the manifests in this order: B A B A C B C B With both patches, this order becomes: A A B B B B C C (This considers only dodiff and repo.changes. I'm not sure how other parts of hg log enter the picture.) The speed up will depend on the revisions being displayed. (All "before" times already have my previous "speed up hg log --debug" patch applied.) hg repo (tip = 414e81ae971f). hg log -p before after real 0m50.981s 0m45.279s user 0m47.930s 0m42.560s sys 0m2.526s 0m2.523s output size: 6917897 bytes kernel repo (tip = 9d4e135960ed). hg log -p -l64 before after real 2m14.995s 1m45.025s user 2m9.509s 1m33.900s sys 0m3.663s 0m2.942s output size: 31497621 bytes same kernel repo. hg log -p -l64 -r c84c2069592f:0 before after real 1m48.045s 1m0.076s user 1m44.094s 0m58.492s sys 0m2.603s 0m1.103s output size: 197983 bytes c84c2069592f was the tip of a 10 day old kernel repo that I had lying around and was where I first tested this patch. For some weird coincidence it's also a place where the patch makes a huge difference.

speed up hg log --debug hg repo: before: real 0m6.998s user 0m6.952s sys 0m0.046s after: real 0m3.884s user 0m3.839s sys 0m0.042s

on revert, only undele files that are removed in the dirstate

Removed now obsolete min/max check in walkchangerevs().

Replaced fixed window size for walkchangerevs with an increasing one. Window sizes starts at 8 (for good interactiveness) and doubles with each window until it is 512, which seems to be the maximum efficient value.

hgmerge: do not use file with markers in tools merging themselves This time I forgot about a crucial part of the logic change. The patch makes kdiff3 and tkdiff useful again.

Fix hgmerge: mkdir "'/tmp'/hgmerge..." and ask_if_merged() didn't work.

Fixed wrong (copy&paste) usage of tmpl instead of self.t in hgweb.

Fix 'hg serve' not using CSS. hgweb.py (templatepath): Return normalized path [fixes later checks in staticfile()]

only write the dirstate when something changed

Allow serving static files from hgwebdir to fix CSS and favicon.

Cleanup of tabs and coding when sending content type.

Merge with jeffpc's hg-static

[hgweb] Added favicon to standard/gitweb templates

Merge with mercurial/tonfa

change the default timeout to 600 seconds

add a timeout when a lock is held (default 1024 sec) - change the wait keyword from lock.lock to timeout, a negative timeout of means "wait forever" - refactor the two lock functions from localrepo.py - make them use the timeout (default 1024, can be changed with ui.timeout in the config file - update the doc

Don't use mktemp in tests, we're already in a secure temp dir.

Added test cases for repo corruption fixed in 2e0a288ca93e (issue132) (submitted by Alexis S. L. Carvalho <alexis@cecm.usp.br>)

revalidate revlog data after locking the repo (issue132)

merge with matt

merge with crew

add an optional argument to push only the specified revisions (push -r)

Merge with jeffpc

Merge with mpm

[hgweb] Move CSS from headers into static files

[hgweb] Static content serving

Merge

Merge with crew

hgmerge: add meld support

hgmerge: improve "apps not found" message

hgmerge: logic changes Details: - keep automatic merge conflicts in $LOCAL - do not assume that $EDITOR returns proper error code - fix a slight mistake in diff+patch merge success detection (it could succeed if the $EDITOR failed to run)

hgmerge: add and use ask_if_merged function This patch, unlike the earlier ones, doesn't use unportable select builtin.

hgmerge: fix diff+patch detection; cleanups Details: - actually show help message when no tools are found - whitespace cleanup (stupid emacs) - quote more variables - simplify merge/diff3 error handling

Merged RSS feed for tags from Peter van Dijk

add rss link to tags page

implement entriesnotip for tags in hgweb.py ; change entries to entriesnotip in templates/tags-rss.tmpl

tags-rss support; still shows tip

hg log --limit shouldn't count unprinted revisions (found by TK Soh)

Cleanup: Put initialization of br in front of --branches option handling.

Make option --branch vs. --branches more consistent. As you can abbreviate --branches to --branch, old scripts using the long name will still work.

Add option -b/--branch to hg tip (as done for hg parents).

merge with crew

fix typo in debugrebuildstate

Sunpro compiler patch The compiling runs through without warning, but runnig the newly builded hg emmits a message: | ImportError: ld.so.1: python: fatal: relocation error: | file /opt/local/lib/python2.3/site-packages/mercurial/bdiff.so: | symbol cmp: referenced symbol not found Removing the inline infront of cmp corrects this error message.

add options to log man page.

merge with crew.

add -l,--limit to log command.

add 'debugrebuildstate' to rebuild the dirstate from a given revision - added and removed files will be lost while recreating the dirstate - modifications are not lost

use repo.lock when cloning via copy, use lock.LockException when necessary

Raise a different exception when the lock is not available When the filesystem is read-only or if we have some other error, there is no need to wait. Raise a lock.LockUnavailable exception.

merge with crew

localrepo: refactor the locking functions

make test-pull-permission cleanup correctly in case of errors

fix warnings from pychecker (unused variables and shadowing)

bisect: fix for recent changes disallowing "false" merges

transitive copy/rename Add support for transitive copy or rename operations, e.g. hg rename a b ... (possibly edit b) hg rename b c hg commit ... by actually renaming "b" as "c" while recording a copy of "a" to "c" and a removal of "a".

Fixed misleading indentation in mpatch.c

merge with crew.

make server tests use --daemon.

Merge with upstream

Added help string for --daemon-pipefds

stop read end of pipe from staying open forever in child process.

add --daemon option to serve command. for issue 45. code looks odd because it is portable to windows. windows does not have os.fork, so have to spawn and use pipe to tell parent ready instead.

AmbiguousCommand is raised too soon. Right now, hg raises AmbiguousCommand as soon as it finds two commands/aliases that start with the substring it's searching for, even though it may still find a full match later on. This is a bit hard to hit on purpose, because hg checks the list of commands in whatever order is returned by table.keys(), which will change when you add an alias to a command. You should be able to hit it by adding an alias "u" to the "identify" command - not that that makes a lot of sense...

Don't hard-code /tmp in test-ro-message This makes the test succeed when $TMPDIR is set.

Merge with crew

add preoutgoing and outgoing hooks. preoutgoing lets prevent pull over http or ssh. outgoing lets notify after pull.

i forgot to change the test output for test-hook.

tests for new hooks. fix things i found when writing tests.

fix test-help diff options.

merge with crew.

add -p option to tip. for issue 64.

add prechangegroup and pretxnchangegroup hooks. prechangegroup lets you stop push, pull or unbundle before it begins. pretxnchangegroup lets you inspect changegroup before transaction is committed, and roll back if you not like it.

merge with crew.

add -w and -p options to diff. this is for issue 126.

fix names of parent changeset ids in hooks. fix hook part of man page.

prefix hook env var names with HG_. old names are still provided, but doc says they deprecated.

merge with crew

add a -b/--branch option to 'hg parents'

Fix diff against an empty file (issue124) and add a test for this.

catch errors and throw exception with invalid binary patch data

add pretxncommit hook. hook allows check of changeset after create, but before transaction is committed. hook failure rolls transaction back. makes place for local policies like commit message must contain bug id or reviewer signoff. change also adds parent changeset ids to commit hook environment, because is cheap and useful.

add pretag and tag hooks. pretag hook lets hook decide how tags can be named. tag hook is notifier.

hook parameters must be strings.

make hook code nicer. pre hooks can raise exception if fail. tidy up better if exception raised (like KeyboardInterrupt) when running hook program.

hooks run after transactions finish must not affect method results.

Refactor excessive merge detection, add test

Revert convert-repo changes

fix hgrc doc hook descriptions.

hooks: distinguish between locally committed and incoming changes. "commit" hook is now for locally committed changes only. "incoming" is for changes pulled, pushed, or unbundled into local repo.

Allow callers to pass in the dirstate lock in most localrepo.py funcs. This makes it possible to take the lock once and commit a large number of patches, without having to read and write the dirstate for each patch.

revlog.strip should clear the chunkcache The chunkcache isn't valid after a strip, it needs to be cleared out.

Show "(No help text available)" for commands without doc string. Currently this only occurs with "hg help qcommit" from mq extension.

Create default commit message in a more pythonic way.

Removed "HG: manifest hash" line from commit message.

Put the empty line in commit text above the branch merge line.

Run commit message editor in the repo root (like hooks). This makes the hgeditor script work with hg commit -R path/to/repo

add changenav at bottom of page if one reads through the changelog and wants to go to the previous or next page one needs the navigation links at the bottom, not at the top of the page

display revision numbers revision numbers are useful for orientation when browsing through the changelog

fix changenav for maxchanges != 10 for maxchanges = 25 the changelog navigation had a minimum stepsize of 30; try to calculate more useful navigation steps

add --mbox output to patchbomb add option to save generated mails in an mbox file for later processing with formail, instead of sending them directly

hgmerge: various cleanups Details: - put temporary file names into variables - make all temporary file names end with random part - cleanup FileMerge handling - do not use hardlinks in FileMerge change test (breaks on FAT) - try harder to keep file mtime unchanged in case of failed merge

hgmerge: add cleanup functions This patch adds functions cleanup, success and failure. The last two of these should be used instead of exit. Current code was changed to use them. It also moves $HGTMP to the top of the file (it's used in the cleanup function), changes the comment and removes now unneeded trap in the diff+patch merge.

hgmerge: add and use more tool variables This patch adds even more customisable variables with tool paths. Also moves $FILEMERGE where it belongs.

Update copyright notice

Merge with crew

Merge with Peter van Dijk

remove escaping from decriptions on repo index page

Added raw view for file annotate in hgweb.

hgweb/templates: remove unused vars from map-raw annotateline contains html and it is unused filenodelink is unused but should be defined

hgweb/templates: no need to escape the '<' '>' and '&' in raw templates

Removed executable bit from patchbomb extension.

Update version strings and add release notes to Windows specific files

Fall back to asciidoc6 html backend if html4 doesn't work. This reenables building documentation on Debian sarge, which broke after 9346a7fb3fe2.

Reverted name change (mercurial -> Mercurial) from dd5085897010.

merge with crew.

make stuff for macos x binary package. it is now easy to make prebuilt binary for macos x. i have no hosting space. i hope someone else can make binaries.

extension gpg.py: really raise the exception in case of invalid data

Cleanup of spacing in bash_completion

Use user specified path to hg in bash_completion e.g. for multiple installs with different versions or extensions.

fix an exception in gpg.py with multiples sigs for the same cset - silly error, do not overwrite the variable we use for iterating - correct 'hg help sign'

fixes for gpg.py extension - add copyright and license - add i18n - add 'sigs' command behaving like 'hg tags' - change 'role' to 'comment' and output it only if there is one - refactoring

Merge with crew

Merge with upstream

reverting 11d12bd6e1dcd9610fa26e97d25e7ad553e8ffa5 passing local everywhere violate the layering

cleanup of revlog.group when repository is local revlog.group cached every chunk from the revlog, the behaviour was needed to minimize the roundtrip with old-http. The patch export the information that the repository is local or not from the repository object down to the revlog. Then it uses the workaround for old-http only if the repository is non-local. The memory used server side when pulling goes down to less than 30Mo maximum whereas without the patch more than 160Mo was used when cloning the linux kernel repository. The time used by cloning is roughly the same (although some caching could be implemented if needed): before 110.25user 20.90system 2:52.00elapsed 76%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+708707minor)pagefaults 0swaps after 112.85user 22.98system 2:50.66elapsed 79%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+862862minor)pagefaults 0swaps

Added missing space in output of gpg.py

merge with crew

abort when using 'update -m' and this is not a merge add more testcases for updating with local changes

merge with self.

add documentation for email command.

forgot to add import statement for _.

add _ to several strings

turn patchbomb script into an extension module. command name is now 'hg email'.

[hgweb] Added rename information to gitweb templates & misc cleanups Fixed up file log template's title Removed double entry for filelogentry in gitweb map file

verify: notice extra data in indices

Added tag 0.8 for changeset 3a56574f329a368d645853e0f9e09472aee62349

Merge with crew

Safer version of FileMerge merge

return a non-zero exit code when a merge failed

Added missing quote in warning text to tests, too.

Added missing quote in warning text.

Fix revlog signature check for empty revlogs

Add revlog version signature check

doc: clone and outgoing point to pull for valid path docs

deprecate the rawcommit command

convert-repo: use commit rather than rawcommit

convert-repo: automatically create empty map file

deprecate the use of 'hg tag NAME [REV]' add some tests and some doc

hgweb: show copy/rename links in file history

unbreak templates/summary-gitweb.tmpl

Fix comment syntax

changed template escape filter, added urlescape filter; audited all templates for insertion bugs; added note to manifest.py about newlines in filenames

hgweb: fix breakage on manifest subdirs from path cleaning

Process working files through encode filters in dodiff()

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

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

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

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

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

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

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

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

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

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

Add new bdiff based unidiff generation.

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

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

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

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

Merge with Eric

Merge with crew

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

Copy manifest map before modifying it (see issue86)

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

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

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

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

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

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

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

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

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

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

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

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

Cleaned up localrepo.changes()

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

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

Added archives links to gitweb template

Adjusted test output to match new hgignore error messages.

make invalid pattern message not confusing.

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

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

document revert command more accurately. this fixes issue 87.

add '_' to several strings

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

merge with mainline

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

make patchbomb work with recent changes to export

strictly adher to 80 chars per line

Error handling for unbundle, fix option line wrapping

add --update support to 'hg unbundle'

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

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

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

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

Re-enable the renamed check fastpath

Merge with crew

if a filename contains spaces, patch adds quote around it

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

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

reloads manifest and changelog after recovering

fix a bug in hg export --switch-parent

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

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

Merge with upstream.

delete unintended print statement

merge with crew

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

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

abort when merging two heads and repository has local changes

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

Remove tabs, and trailing whitespace from hgweb.py

[hgweb] Remove reference to a non-existing file

[hgweb] Fixed up bad link

File log and some FIXMEs

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

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

File revision style fixed

[hgweb] Initial import of the "gitweb" style

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

hg log -p should show file deletions

quote the filename when calling HGEDITOR

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

make command defaults works for aliases

Handle hg under /

fix rename --after

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

export patkind() from util

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

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

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

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

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

Updated help text for 'hg log'.

Space/Tab cleanup in bash_completion.

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

Catch IOErrors and RepoErrors when serving repositories via hgweb.

Merge with mercurial/crew

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

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

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

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

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

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

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

fix errors found by pychecker

added st as alias for status in zsh_completition

Merge with Thomas Waldmann

made C src formatting more consistent

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

minor optimization: save some string trash

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

Merge with upstream

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

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

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

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

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

reset mtime when two files are equal

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

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

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

add an atomic argument to util.opener when atomic is used, the file while be renamed on close

don't print anything about file of unsupported type unless the file was specified on the command line

fix a bug where command defaults suppress global options

Merge with TAH

hgweb: fix traceback by skipping invalid repo paths

Fix line wrapping

Added --date option to annotate.

copy the mode of the file when breaking hardlinks

Allow ambiguous command shortcut if only an alias for the same command. Currently the only example for this is 'hg o' or 'hg ou' as a shortcut for 'hg out' and 'hg outgoing'.

Merge with TAH

Improved error message for ambiguous command shortcuts.

Canonicalize command when using aliases or prefix matching. This makes the norepo check and the help and version command work when not using the canonical name.

Automatically run "verify" whenever we run "recover"

Fix up test-help, mark test-rename +x

avoid to copy more than one file to the same destination file

copy & rename don't overwrite unless --force is specified

generalize copy/rename to handle more than one source directory

hgweb: remove redundant rstrip filter

use self.{w,}join when possible

Add safety check for addgroup

fix a warning when py2exe is not used

Add explicit 'st' alias for status

if unambigious command name are passed, use them

Add support for -r option in hg tag

fix file opening for some commands on Windows Using file as opener in debug commands won't work on Windows, as the index and data files needs to be opened in binary mode.

Merge with TAH

Fixed test-static-http with http_proxy variable set again.

Merge from Hidetaka Iwai

Fixed to convert to man properly.

Fixed wrong encoding of files.

hgweb: Added archive download buttons to manifest page.

Add permissions handling test

remove the deprecated --text (t) option to rawcommit and tag

Deal with merge abort more gracefully We save parent info last rather than first.

Handle empty logs in repo.checksize

verify: add check for mismatch of index and data length

Allow interrupting all parts of verify

fix a bug in dirstate.changes when cwd != repo.root - use lstat instead of stat - add a testcase (thanks to Johannes Hofmann)

minor doc fix

Added Japanese translations of manpages.

only files in normal state should be marked as deleted fix a traceback when you removed an added file

fix handling of files of unsupported type in the walk code if a file was of unsupported type, it was considered as 'seen' while walking. this way it was possible to have file in the dirstate not yielded by the walk function.

zsh: allow 'hg clone' to complete paths listed in ~/.hgrc

mention running multiple hooks in the doc

zsh completion improvements. File completers now correctly deal with filenames that contain spaces. The completers also use 'hg status .' so they'll work correctly when the default behaviour changes.

Fix traceback on bad system hgrc files

fix handling of daylight saving time

Change test-hook to test multiple hooks

allow multiples hook suggested by Vadim Gelfer This patch allows to have multiple hooks of the same kind: for example commit.email = /my/email/hook commit.autobuild = /my/build/hook

fix a bug where hg could remove file ending with .tmp util.opener used a fixed filename for writing tempfile instead of using the tempfile module.

add a test for hgignore

util.opener already create the base directory if it doesn't exist

fix dirstate.change: it should walk ignored files

Elevate parents to a "common" command in help

Add missing test output

make readconfig take a filename instead of a file pointer as argument catch parse error while reading a config file add a testcase for parse error

make revert use standard matcher

rewrote changes function in dirstate to use generic walk code now, file with unsupported type will not show up in status anymore

minor fix on command help docstrings

Merge bundle -r work from Eric Hopper

Added a test for clone -r.

Stupid spelling mistake in a variable name.

Added a lot of comments to changegroupsubset.

Implementing pull -r and changing clone -r. Both now support multiple 'target' revisions.

Fixed silly bug involving a non-existent variable.

Fix to handle case of empty list for roots or heads in nodesbetween.

Optimizing manifest reads in changegroupsubset by using deltas.

Implementing clone -r, which clones all changesets needed to reach a particular revision.

Bug fixing in localrepository.changegroupsubset. Bugs found in testing.

Fix small bug in nodesbetween if heads is [nullid].

This changes the revlog.group and re-implements the localrepo.changeroup function in terms of it. revlog.group now takes a list of nodes, and some callback functions instead of a linkmap.

This implements the nodesbetween method, and it removes the newer method and replaces it with calls to nodesbetween. nodesbetween calculates all the changesets needed to have a complete revision graph between a given set of base nodes and a given set of head nodes.

Remove copy/rename --parents option This is no longer needed now that we have more standard UNIX-like copy semantics.

[PATCH] copy/rename a directory This patch adds support for 'hg copy dir1 dir2' or 'hg rename dir1 dir2'. When "dir2" exists, "dir1" is recursively copied (or moved) to "dir2/dir1". When "dir2" does not exists, "dir1" is copied to (renamed as) "dir2".

further fix traceback on invalid .hgignore patterns Please apply this little fix (matchfn return None if no patterns are specified).

get command defaults from hgrc

Remove now unused sortdiff and diff from mdiff

Remove old manifest diff code, it's now buggy

Add Benoit to CONTRIBUTORS

Add test-confused-revert, fix permissions on test-revert

Allow reverting a deleted file with two parents As elsewhere, we choose the first parent by default

revert added and removed files to their normal state before reverting add a test for revert

abort on invalid pattern in matcher

hgweb: add strip and rstrip filters to handle summary

fix for cloning empty repo (.hg is still empty)

Remove deprecated commit -t option

zsh completion: Added '--newest-first' to incoming, outgoing

hgweb: a couple of fixes on search page - show search string in the bottom search box - wrap search boxes within paragraphs, this also puts some space between last changeset and bottom search box in firefox.

Fix relative pull in a subdir

allow 'hg out' / 'hg in' to show newest commit first

zsh completions: new -M, -m arguments for log, etc.

import docstring from doc/hg.1.txt

add --only-merges (-m) log

add --no-merges (-M) for log, outgoing, incoming

Fix use of diff(1) triggered by set -e. Search harder for a decent diff/patch to use.

hgweb: fix broken filelog->changelog link

hgweb: fix broken search->changelog link

Calling flush is unnecessary with bz2 decompressors and may not even exist.

hgk: add horizontal scrollbar to patch window

Add control-w key binding to quit hgk.

Change asciidoc backend to more recent name. The latest asciidoc doesn't have an 'html' backend. 'html' was last valid with version 6 ( 2005-1-28). Current options are xhtml11, or html4, with xhtml11 by default.

Fixed problem with invoking hgmerge on paths with spaces.

add a target for running only one test

hgweb: improve look-n-feel of changelog nagivation

[issue21] cannot debug extension The following patch should work.

Use $(MAKE) not make

py2exe is not able to handle win32com.shell Changes: - setup.py: help py2exe finding the shell module in win32com.shell

Option -i broken in py2exe_for_demandload Using the includes option -i on modified py2exe is not working. Change: - setup.py: convert self.includes to a list.

Avoid insertion/deletion of CRs on stdio during hg serve

hgweb: fix broken tags->changelog link

Make hgweb work when the repository is empty (no 00changelog.i)

hgweb: add a mercurial link to the footer

hgweb: hide trivial parent (like in show_changeset)

refactor some unlink/remove code and make sure we prune empty dir

New vim script; provides key mappings and menus for GVIM

Do not use 'glob' expansion by default on OS != 'nt'

hgweb: fix too short manifest link

hgweb: make viewing of non-text work in hgweb We use mimetypes.guess_type to guess file types and util.binary to determine whether a file is displayable as text. This lets us display displayable text files in our normal source view. Files that appear to be binary will be displayed as something like "(binary:image/gif)". Clicking on raw view will send the raw file with an appropriate MIME type. Thus things like GIFs will now be viewable inside hgweb without making a mess. Further, things like postscript files that are text should show source in the normal view and a browser can launch a postscript viewer for the raw view.

hgweb: shorten all the URLs in the standard templates A URL like this: http://www.selenic.com/hg/?cmd=changeset;node=5010207c35273ac1331cae44c253dd41fa07cb7f is now presented as: http://www.selenic.com/hg/?cs=5010207c352 (though the old style still works, of course)

hgweb: add shortcuts for all the web commands / fix empty arg bug

symlink unit test

allow empty values for url so we can have /?tip

hgweb: allow urls to be shorter by using shortcuts for example cs=xxx will be expanded to cmd=changeset;node=xxx

log: speedup keyword search when used with --branch By avoiding unnecessary branch lookup.

log: make keyword search truly case-insensitive

lazyindex fix, make load handle negative indexes properly.

i18n part2: use '_' for all strings who are part of the user interface

use a dummy function for gettext import gettext is really slow, until we figure out a solution we use identity for gettext

i18n first part: make '_' available for files who need it

Try to use ini-file in the same directory as the exe as the default on NT.

make update quieter when nothing is wrong sometimes when i am going around in my history, i get long lists of errors from the update command. this patch will fix that. i tried to make the code style the same like the rest of the code.

bdiff: change spurious __inline to inline

check if a file is ignored before complaining if it is an unsupported type

Add debugsetparents command

dirstate: make sure we read the dirstate before setting parents

Fix traceback on bad revlog.lookup

add a check for filetype when walking

Fix patch failure reporting exception

Borrow patch header detection heuristic from quilt

convert-repo: fix up octopus merge conversion

convert-repo: change duplicate elimination

convert-repo: linearize the tag commit

convert-repo: retrieve the commit hash from the tag object for tag import

convert-repo: Fix timezone handling

hg verify: add some bin to hex conversions

hg verify: add an error reporting helper function

hg verify: more consistency checking between changesets and manifests

log --debug: fix misplaced manifest field Index: hg/mercurial/commands.py =================================================================== --- hg.orig/mercurial/commands.py 2005-10-04 16:44:26.000000000 -0700 +++ hg/mercurial/commands.py 2005-10-04 17:16:42.000000000 -0700 @@ -1238,6 +1238,9 @@ def log(ui, repo, *pats, **opts): self.write(*args) def write(self, *args): self.hunk[self.rev].append(args) + def debug(self, *args): + if self.debugflag: + self.write(*args) def __getattr__(self, key): return getattr(self.ui, key) cwd = repo.getcwd()

Fix an hg copy/move bug. Failed if file being copied or moved not in tip.

Clean up mdiff imports

make diff dates be epoch for add/remove

Fixed a bug in my changes to httprepo.py

Fix same performance bug as c3654cfaa77 but for httprepo.py instead.

Fix traceback when nothing was added during unbundle The changegroup and commit hook are now run only when something is modified. The correct number of changesets added is printed.

Fix hg unbundle chunking performance bug

hg log: add -k for keyword searching

Merge with TAH

emacs minor mode optional argument With GNU Emacs 21.4.1 and desktop save/restore enabled, loading "mercurial.el" from ".emacs" breaks Emacs' initialization sequence when the desktop restore code loads a file under Mercurial control. The function 'desktop-create-buffer' passes an argument to each minor mode it activates for the buffer.

hgweb: remove various manifest and file hashes from display

Allows abbreviated hashes in hgweb

Fix completion function for 'hg pull'. Fix truncation bug and remove tabs.

bisect extension for mercurial it works almost the same as git-bisect: hg bisect init # start bisecting hg bisect bad # mark current revision as broken hg bisect good [<rev>] # mark <rev> as working ... the bisect code finds a new revision to try ... see if it works hg bisect good # if it worked hg bisect bad # it doesn't work continue until there is only one revision left

Fixed an exception that was caught and improperly forgotten.

Suppress warning in zsh_completion script

Fix data reported for the nullid changeset

Merge with self

zsh completion function for hg

contrib/hgk: remove hardcoded path to Wish

Re-add hgext/__init__.py

Set the user agent for httprepo communication

Partially revert ssh change so we read all of remote ssh stream

Replacing select.select() with os.fstat() which works also on windows.

Fix +x permissions lost by export/import

Test case for the misleading message on bad permissions.

Made the abort message for IOError nicer when the filename is known.

Fix misleading abort message when permissions are bad.

Make test-merge7 repeatable

Repair ancestor logic, fix up test cases

Fix pipe error regression

More info on file merge for update --debug

hgwebdir: Fix date display

Fix up static-http test

Execute hooks in the repository root

hgk: Allow specifying hgk path in [hgk]path

Fix hgk for date handling changes

Add support for /etc/mercurial/hgrc.d/*.rc

Warn on failure to import an extension

Fix copyright symbol in docs --- hg.orig/doc/hg.1.txt 2005-09-22 09:40:47.000000000 -0700 +++ hg/doc/hg.1.txt 2005-09-23 18:31:58.000000000 -0700 @@ -802,6 +802,6 @@ http://selenic.com/mailman/listinfo/merc COPYING ------- -Copyright (C) 2005 Matt Mackall. +Copyright \(C) 2005 Matt Mackall. Free use of this software is granted under the terms of the GNU General Public License (GPL). Index: hg/doc/hgmerge.1.txt =================================================================== --- hg.orig/doc/hgmerge.1.txt 2005-06-30 10:19:51.000000000 -0700 +++ hg/doc/hgmerge.1.txt 2005-09-23 18:31:59.000000000 -0700 @@ -30,6 +30,6 @@ hg(1) - the command line interface to Me COPYING ------- -Copyright (C) 2005 Matt Mackall. +Copyright \(C) 2005 Matt Mackall. Free use of this software is granted under the terms of the GNU General Public License (GPL).

hgk is a wish script --- mercurial-0.7.orig/contrib/hgk 2005-09-23 11:02:21.000000000 +0200 +++ mercurial-0.7/contrib/hgk 2005-09-23 11:07:57.000000000 +0200 @@ -1,6 +1,4 @@ -#!/bin/sh -# Tcl ignores the next line -*- tcl -*- \ -exec wish "$0" -- "${1+$@}" +#!/usr/bin/wish # Copyright (C) 2005 Paul Mackerras. All rights reserved. # This program is free software; it may be used, copied, modified

bash_completion is not an executable Index: hg/contrib/bash_completion =================================================================== --- hg.orig/contrib/bash_completion 2005-09-22 09:40:47.000000000 -0700 +++ hg/contrib/bash_completion 2005-09-23 18:32:46.000000000 -0700 @@ -1,5 +1,3 @@ -#!/bin/bash - shopt -s extglob _hg_commands()

Add empty repo test

Fix up some bugs for log and grep with empty repo

hgweb file: fixed left-justified line numbers on IE v6.0 IE (v6.0) seemed to squash the spaces surrounding the line numbers, making them appeared as left- instead of being right-justified. Testing with IE v6.0 and Firefox 1.0.6.

git -> hg conversion script contrib/convert-repo changes: - do not print verbose output so that error messages are seen more easily - Output the date as integer and not as floating point number. - Do not require a ".git" subdirectory to work on, but use the GIT_DIR environment var to specify the git repository. Change is otherwise compatible to the current version and I have tested it by converting the kernel and several git respositories from kernel.org. (Btw, the udev test dir contains a /sys dir with entries which should not be normal dirs and not be normal files. ;-) Thanks again for mercurial, Florian La Roche --- a/contrib/convert-repo +++ b/contrib/convert-repo @@ -28,26 +28,18 @@ self.path = path def getheads(self): - h = file(self.path + "/.git/HEAD").read()[:-1] - return [h] + return [file(self.path + "/HEAD").read()[:-1]] def catfile(self, rev, type): if rev == "0" * 40: raise IOError() - path = os.getcwd() - os.chdir(self.path) - fh = os.popen("git-cat-file %s %s 2>/dev/null" % (type, rev)) - os.chdir(path) + fh = os.popen("GIT_DIR=%s git-cat-file %s %s 2>/dev/null" % (self.path, type, rev)) return fh.read() def getfile(self, name, rev): return self.catfile(rev, "blob") def getchanges(self, version): - path = os.getcwd() - os.chdir(self.path) - fh = os.popen("git-diff-tree --root -m -r %s" % (version)) - os.chdir(path) - + fh = os.popen("GIT_DIR=%s git-diff-tree --root -m -r %s" % (self.path, version)) changes = [] for l in fh: if "\t" not in l: continue @@ -83,9 +75,9 @@ def gettags(self): tags = {} - for f in os.listdir(self.path + "/.git/refs/tags"): + for f in os.listdir(self.path + "/refs/tags"): try: - h = file(self.path + "/.git/refs/tags/" + f).read().strip() + h = file(self.path + "/refs/tags/" + f).read().strip() tags[f] = h except: pass @@ -99,8 +91,7 @@ def getheads(self): h = self.repo.changelog.heads() - h = [ hg.hex(x) for x in h ] - return h + return [ hg.hex(x) for x in h ] def putfile(self, f, e, data): self.repo.wfile(f, "w").write(data) @@ -155,12 +146,12 @@ newlines.sort() if newlines != oldlines: - print "updating tags" + #print "updating tags" f = self.repo.wfile(".hgtags", "w") f.write("".join(newlines)) f.close() if not oldlines: self.repo.add([".hgtags"]) - date = "%s 0" % time.mktime(time.gmtime()) + date = "%s 0" % int(time.mktime(time.gmtime())) self.repo.rawcommit([".hgtags"], "update tags", "convert-repo", date, self.repo.changelog.tip(), hg.nullid) @@ -262,7 +253,7 @@ num -= 1 if c in self.map: continue desc = self.commitcache[c][3].splitlines()[0] - print num, desc + #print num, desc self.copy(c) tags = self.source.gettags() @@ -275,6 +266,8 @@ self.dest.puttags(ctags) gitpath, hgpath, mapfile = sys.argv[1:] +if os.path.isdir(gitpath + "/.git"): + gitpath += "/.git" c = convert(convert_git(gitpath), convert_mercurial(hgpath), mapfile) c.convert() _______________________________________________ Mercurial mailing list Mercurial@selenic.com http://selenic.com/mailman/listinfo/mercurial

hgweb: fixed IE display problem on changelog page IE (v6.0) didn't seemed to comply to the 15% width on the left column of changelog display. Tested with IE v6.0 and Firefox 1.0.6.

hgweb: fix date bug in hgweb diff generation

Help debugability: print ssh command being used when --verbose.

Write hgrc file in text mode, even on Windows.

Give ssh a better chance of working on Windows. Switch the type of quotes used for the remote command. Open the pipe in binary mode.

Allow files to be opened in text mode, even on Windows.

Merge with myself.

Some repos represent a date as a float.

Merge with MPM.

Move urllib error handling from revlog into statichttprepo, where it belongs.

hgweb: pass date tuples around rather than whole changesets for dates

Fix old-http test when no server exists.

Make revlog constructor more discerning in its treatment of errors.

Clean up date and timezone handling. We used to pass changelog dates around as a "unixtime timezone" string containing a pair of encoded ints. Now, they get passed around as a (unixtime, timezone) tuple of numbers, which makes much more sense.

Fix up representation of dates in hgweb. Date display is now uniform both on the command line and via the web interface.

Fix behaviour of commit. It's now a fatal error if the option to --logfile isn't readable. Ditto if both --message and --logfile are specified.

Unify display of dates. We now use one function, commands.datestr, to display dates, instead of calling time.asctime in inconsistent ways.

Print commit time/date from perspective of committer. Previously, it was printed in the time zone of the reader, but with the committer's time zone offset. It is now consistent.

Hook fixups Pass the first new changeset node to the changegroup hook Call commit for each changeset in a pull changegroup Improve hook docs

Fix setting of hg default when using --pull on clone of local repository.

Fix default clone destination The default clone wasn't working: $ hg clone hg abort: repository hg/.hg not found! This was because we were creating the destination directory from the default, then checking whether it existed to determine whether to expand the path.

Fix traceback during invalid rev identifier for debugdata

Merge with TAH

bash_completion: extended patterns require extglob option

Updated CONTRIBUTORS.

Make debugwalk strip trailing spaces and remove these from test-walk.out

Cleanup of tabs and trailing spaces.

Merge with BOS

Add release notes to built Windows package.

Update Windows release notes.