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.