.hgignore
author Patrick Mezard <patrick@mezard.eu>
Tue, 07 Feb 2012 18:47:16 +0100
branchstable
changeset 1049 fcc01604f7a6
parent 450 86c17b3e9100
permissions -rw-r--r--
mq: restore _branchtags() fast path (issue3223) Since a5917346c72e, mq saves the nodeid of the first applied patch to cache/branchheads, which breaks the optimized cache handling introduced in fbf8320f25c8. The problem is the revision being committed is appended to mqrepo.applied after the commit succeeds, which means mqrepo._branchtags() performs a regular update and write the first applied patch to the branch cache. One solution is to set a context variable _committingpatch on the mqrepo while it is committing a patch and to take it in account when deciding to fast-path mqrepo._branchtags(). Not really elegant but it works. The changes to test-mq-caches.t reverse changes introduced by a5917346c72e. The cache should not have been updated with mq records. The changes to test-keyword.t are indirectly caused by a5917346c72e. Reported and analyzed by Yuya Nishihara <yuya@tcha.org> Notes: - qpush still makes a slow path _branchtags() call when checking heads. Maybe this can be optimized. - be careful when merging this patch in default as secretcommit() was renamed newcommit() right after the end of the code freeze. [ original upstream message ]
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
0
41c7e55cd9e9 Startup hgkeyword package with .hgignore, __init__.py
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
     1
syntax: glob
41c7e55cd9e9 Startup hgkeyword package with .hgignore, __init__.py
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
     2
41c7e55cd9e9 Startup hgkeyword package with .hgignore, __init__.py
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
     3
*.pyc
124
99dc49c5bcfb Setup standalone module install, version tracking
Christian Ebert <blacktrash@gmx.net>
parents: 0
diff changeset
     4
*.pyo
0
41c7e55cd9e9 Startup hgkeyword package with .hgignore, __init__.py
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
     5
*~
41c7e55cd9e9 Startup hgkeyword package with .hgignore, __init__.py
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
     6
*.swp
41c7e55cd9e9 Startup hgkeyword package with .hgignore, __init__.py
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
     7
*.orig
41c7e55cd9e9 Startup hgkeyword package with .hgignore, __init__.py
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
     8
*.rej
450
86c17b3e9100 (stable) ignore .DS_Store
Christian Ebert <blacktrash@gmx.net>
parents: 238
diff changeset
     9
.DS_Store
124
99dc49c5bcfb Setup standalone module install, version tracking
Christian Ebert <blacktrash@gmx.net>
parents: 0
diff changeset
    10
212
0ac36a08c320 hgignore build directory
Christian Ebert <blacktrash@gmx.net>
parents: 124
diff changeset
    11
build/*
220
943e1e1ea042 Include MANIFEST.in in dist; hgignore MANIFEST
Christian Ebert <blacktrash@gmx.net>
parents: 212
diff changeset
    12
MANIFEST