use os.path.islink instead of util.is_link; remove util.is_link

Add some tests for symlink tracking

Fix localrepo.copy to deal with symbolic links.

Backup symbolic links when reverting

fix util.copyfile to deal with symlinks

hg-relink: do not compare .d files

Make import opportunistically use merge information

Add import --exact. When this option is set, import will apply the patch (which must be generated by export) to the parents specified in the patch, and check that the node produced by the patch matches the node ID in the patch.

Add --outgoing option to patchbomb

Merge additional fixes for my matcher changes

glob:<directory> patterns match the files in that directory. This makes the behaviour of glob: patterns more consistent: hg status glob:dir and hg status -I glob:dir will match the same files. It's also consistent with the fact that {rel,}path patterns recursively match the contents of a directory.

Pass normalized directory names to the ignore function This fixes a bad performance regression caused by dd0d9bd91e0a.

tests: expand test-commit a bit to test 'hg commit .' too

fix hg commit . in the repo root

transplant: fix ignoring empty changesets (eg after filter)

Merge with crew-stable.

debugsetparents: wlock the repo before updating the dirstate

avoid _wsgioutputfile <-> _wsgirequest circular reference We use the _wsgirequest object itself as the output file object. To avoid a "self.out = self" which would create another circular reference, we make the "out" attribute a trivial property.

avoid wsgiapplication <-> MercurialHTTPServer circular reference

hgwebdir: break templater -> templater circular reference This is essentially another instance of the same problem fixed by the parent changeset. See its commit message for the details.

hgweb: break templater -> templater circular reference The problem were some functions passed in the "defaults" argument during the templater creation which use "self.t" directly. This creates the cycle: hgweb object -> templater object -> defaults dict -> footer function -> hgweb object Instead of completely avoding the cycle, we break it after using the templater.

Add hg-relink script to contrib

merge with crew-stable

Fixed synopsis for some mq commands

hg qseries -m: guards file was not ignored

Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)

Simplified qseries and hg qapplied to fix some bugs caused by optimization: - hg qapplied -v now works consistendly to hg qunapplied -v, i.e. showing guarded (or unapplied because they were guarded during hg qpush) patches. - hg qapplied <patchname> now works again

Fix issue443: inconsistent output of "hg qunapplied -v" 1. Don't skip over unpushable (guarded) unapplied patches. 2. Don't display unpushable patches, unless -v is given, otherwise guarded and unguarded patches can't be distinguished.

Merge some matcher fixes/cleanups and add some more hg locate tests

util._matcher: remove superfluous variable

add some more tests to hg locate

make the output of test-locate more readable

util._matcher: use "." as the root of empty {rel,}path patterns Should fix issue332. Really.

Merge with crew-stable

avoid a traceback with hg branch newbranch; hg up

Fix handling of paths when run outside the repo. The main problem was that dirstate.getcwd() returned just "", which was interpreted as "we're at the repo root". It now returns an absolute path. The util.pathto function was also changed to deal with the "cwd is an absolute path" case.

pass repo.root to util.pathto() in preparation for the next patch

hgweb: handle IOErrors and OSErrors during unbundle This allows the client to display a reasonable message to the user (e.g. "Permission denied: .hg/lock"), instead of the current "<url> does not appear to be an hg repository".

hgweb.unbundle: call req.httphdr only after the last possible call to bail

Work around a urllib2 bug in Python < 2.4.2 When urllib2 base64-encodes the password needed for the Proxy-authorization header, it forgets to remove the trailing "\n". Later, a "\r\n" sequence is appended to every header, as required by the standard. Some proxies interpret the resulting "\n\r\n" sequence in the same way as "\r\n\r\n": end of headers. This usually doesn't cause trouble for this request, but when the proxy tries to read the next one, it thinks the request starts with some garbage and returns a "400 - Bad Request" error.

Fix confusing message from hg revert (issue332) % mkdir sub1 % touch sub1/file1 % hg add sub1/ adding sub1/file1 % hg rev sub1 sub1: No such file in rev e4c586763258 forgetting sub1/file1

Merge with stable

Merge with crew

revlog: attempt to gracefully handle some interleaved damage

merge with crew-stable

Merge with hg-stable

Merge with mpm

Merge with -stable

tags: add --remove

tags: remove unused variables

Make the tags algorithm smarter

Refactor tags code to prepare for improving the algorithm

merge with crew-stable

Only hg repositories override [paths], not simple directories (fixes issue510)

git-send-email compatibility: stop reading changelog after ^---$

mq: add qparent tag (first parent of qbase)

Merge with -stable, fix small test failure

Remove dummy branch hack from tests

Move branch read/write to dirstate where it belongs

Minor default branch cleanups

Move branches.cache to branch.cache Keeps old clients from conflicting with new caches, makes features logic unnecessary.

"default" is the default branch name

Make [PATCH] removal slightly more robust

Remove undo log after mq operations that rollback would break

Refresh file size after partial qrefresh. This makes a subsequent hg revert; hg status work.

Clarify update help text for update without an explicit revision

Improve hg branch -f help text

Add test for branch shadowing

branch: require --force to shadow existing branches

Strip [PATCH...] from message subject when importing patches

Merge a bunch of matcher and locate fixes.

Optimize return value of util._matcher for hgignore case

Optimize return value of util._matcher for common command line case This will trigger every time somebody runs something like "hg diff" or "hg status" without any arguments. The important part here is returning util.always as the match function, which is a much simpler (and faster) function than the usual return value, and allows other code to just skip the filtering if it knows all files will match.

remove unused "head" hack from util._matcher

locate: exit(1) if we didn't print any file

change locate to use relglobs by default This makes its default behaviour useful again (issue108), and changes it search the entire repository by default (instead of just the cwd), just like all other commands. It also hides issue204 by default, but you'll still see the same behaviour if you give it a relpath: pattern.

localrepo.walk: if we're walking a specific revision, sort the files This is more consistent with our behaviour while walking the working directory.

dirstate.statwalk: explicitly test for ignored directories This removes a hack where we appended '/' to a dirname so that: - it would not appear on the "dc" dict - it would always be matched by the match function This was a contorted way of checking if the directory was matched by some hgignore pattern, and it would still fail with some uses of --include/--exclude patterns. Things would still work fine if we removed the check altogether and just appended things to "work" directly, but then we would end up walking ignored directories too, which could be quite a bit of work. This allows further simplification of the match function returned by util._matcher, and fixes walking the working directory with a --include pattern that matches only the end of a name.

util._matcher: unify pattern normalization This should fix issue347. It also highlights one issue with the directory walking code when you have an --include pattern that matches the end of a filename. This is fixed by the next patch.

make the output of test-walk more readable

util.*matcher: change default "names" argument names=['.'] means "include (recursively) only files from the current subdir"; the function then did a hack to walk the whole tree. Clean that up. This also fixes a problem where "--include ." works in a subdir, but not on the tree root.

util._matcher: fix handling of path: patterns

util._matcher: fix handling of relglob: patterns

A 'glob:foo?bar' pattern determines a root - the tree root

Leave normalization of patterns to util._matcher Passing [] to util.cmdmatcher accidentally fixes walking of files with "\n" in the name.

util._matcher: update comments This should match the code better. Except for bugs...

remove obsolete code from patch.diff repo.status already does this filtering. If the caller supplies a set of changes, it's his responsibility to filter out what he doesn't want.

small globprefix fix

Merge with crew-stable

Test update to branch tip

Make update with no node jump to the tip of the current branch

fix qrefresh'ing an empty patch This is not superefficient (the commit will have to walk the whole tree), but it works.

statwalk: don't put self.root in the files list That list is supposed to contain internal, normalized names ("/"-separated, relative to the repo root), not OS-native paths.

fix qclone to a remote repo This fixes issue467. -stable still needs something like revision 55578a8d7e84 - mq: allow push if -r is given explicitly. In the meantime, hg qpop -a; hg qclone . ssh://... is a workaround.

Save an absolute path in repo.path This should keep things working if the process changes directories after creating a repo object.

merge with crew-stable

Add tests for .hg/branches.cache feature list.

Add a features list to branches.cache to detect caches of old hg versions. The leading space in the written file makes sure that the feature list never can match an existing version, even if the first feature can be read as hex. Additionally old hg versions display the id with --debug, too.

Store empty (default) branch in branch cache, too. Operations on this branch don't work otherwise. Reading branches.cache had to be adjusted to allow an empty label. Adjusted reading of the cache tip for symmetry, no functional change here.

small fixes for the parent patch - format.usestore is a boolean option - python wart: ("revlogv1") is a string, not a tuple - only create a dummy changelog if we're using a store - add a test

Merge with crew

Allow disabling store format to work with absurdly long filenames

hgweb: use the given revision in the name of the archive If you ask for an archive in hgweb by tagname the directory in the archive should include the tagname not the changeset-id.

incoming/outgoing: print the name of the other repo

localrepo.status: use manifest.find on "lookup" files

localrepo.status: fcmp gets a getnode function instead of the manifest

fix manifest.find

merge with crew-stable

Fix sed expression in test-notify to be more portable.

Fix help text for hg status -i

purge.py: fix invocation of statwalk

Delete the README for purge, putting the useful informations in comments

Delete the Purge class, refactoring Purge.purge() in dopurge()

Do not use 'self' in the purge() method Avoid any reference to 'self' in Purge.purge() to allow its refactoring in a simple function.

Use nested functions instead of object methods

Merge _remove_file() and _remove_dir() in a single function

Use "f in dirstate" instead of "dirstate.state(f) == '?'"

Reduce the absolute/relative path conversion in the purge extension

Make the purge extension use the statwalk walker from the dirstate object

Yield directories in dirstate.statwalk()