FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Wed, 16 May 2012 17:02:30 +0900] rev 16748
doc: add detail explanation for 'present()' predicate of revsets
Matt Mackall <mpm@selenic.com> [Fri, 18 May 2012 14:34:33 -0500] rev 16747
osutil: handle deletion race with readdir/stat (issue3463)
Matt Mackall <mpm@selenic.com> [Thu, 17 May 2012 15:52:14 -0500] rev 16746
merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 17 May 2012 15:34:59 -0500] rev 16745
branchcache: backout 0311a6abd38a
Augie Fackler <raf@durin42.com> [Wed, 16 May 2012 16:18:07 -0500] rev 16744
dispatch: try and identify third-party extensions as sources of tracebacks
Extension authors should explicitly declare their supported hg
versions and include a buglink attribute in their extension. In the
event that a traceback occurs, we'll identify the
least-recently-tested extensionas the most likely source of the defect
and suggest the user disable that extension.
Packagers should make every effort to ship hg versions from exact
tags, or with as few modifications as possible so that the versioning
can work appropriately.
Augie Fackler <raf@durin42.com> [Tue, 15 May 2012 14:37:49 -0500] rev 16743
hgext: mark all first-party extensions as such
Kevin Bullock <kbullock@ringworld.org> [Sat, 05 May 2012 15:12:26 -0500] rev 16742
bookmarks: test that bare update forwards active bookmark
Christian Ebert <blacktrash@gmx.net> [Sun, 13 May 2012 14:26:26 +0100] rev 16741
keyword: intentionally ignore check-code warning about unwrapped ui message
Kevin Bullock <kbullock@ringworld.org> [Wed, 16 May 2012 10:29:11 -0500] rev 16740
help: include bookmarks in 'help revisions' and simplify wording
Matt Mackall <mpm@selenic.com> [Thu, 17 May 2012 12:15:30 -0500] rev 16739
merge with i18n
Alexander Sauta <demosito@gmail.com> [Tue, 15 May 2012 14:58:16 +0100] rev 16738
i18n-ru: synchronized with b490be1fec06
Nikolaj Sjujskij <sterkrig@myopera.com> [Tue, 10 Apr 2012 11:17:06 +0400] rev 16737
i18n-ru: correct `push --new-branch` description
Sune Foldager <cryo@cyanite.org> [Sat, 12 May 2012 19:38:20 +0200] rev 16736
bundle: make bundles more portable (isue3441)
This is achieved by acting as if the user had given -r<rev> for each head rev
of outgoing changesets on the command line, as well as appropriate
--base <rev>.
The discovery information is computed as normal, and then adjusted as above.
Matt Harbison <matt_harbison@yahoo.com> [Mon, 14 May 2012 19:25:13 -0400] rev 16735
revset: fix traceback for bogus revisions in id(rev)
hg log -r "id(1234567)" now returns an empty list like rev() does.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 15 May 2012 12:44:07 +0200] rev 16734
Makefile: remove generated mercurial/__version__.py
Patrick Mezard <patrick@mezard.eu> [Sun, 13 May 2012 14:00:58 +0200] rev 16733
mq: rename --check into --keep-changes
I named it --check because it felt like qpush & co were checking *more*
things to ensure local changes could not be lost. But it has been
pointed on the mailing list that --check is already used by update
command with a meaning almost opposite to this one. An alternative
was --keep but qfold and qdelete already have such an option to preserve
patch files and qfold may be a candidate for --check.
- qpush/qpop/qgoto --check becomes --keep-changes.
- mq.check becomes mq.keepchanges.
- The short option -c is dropped as -k may conflict with existing
--keep. The availabilitity of mq.keepchanges should not make this too
painful.
- Fix minor reST mistake in option description.
Bryan O'Sullivan <bryano@fb.com> [Sun, 13 May 2012 11:56:50 +0200] rev 16732
parsers: use Py_CLEAR where appropriate
Na'Tosha Bard <natosha@unity3d.com> [Sun, 13 May 2012 12:11:50 +0200] rev 16731
largefiles: fix addremove when largefile is missing (issue3227)
Bryan O'Sullivan <bryano@fb.com> [Sun, 13 May 2012 12:01:52 +0200] rev 16730
tags: short-circuit if no tags have ever been committed
Matt Mackall <mpm@selenic.com> [Wed, 16 May 2012 11:40:33 -0500] rev 16729
largefiles: fix default clone destination regression
Matt Mackall <mpm@selenic.com> [Tue, 15 May 2012 07:01:35 +0200] rev 16728
merge with crew
Matt Mackall <mpm@selenic.com> [Tue, 15 May 2012 07:00:55 +0200] rev 16727
merge with stable
Mark Round <hg@markround.com> [Mon, 14 May 2012 13:25:42 +0100] rev 16726
posix: workaround lack of TIOCGWINSZ on Irix (issue3449)
On an Irix 6.5.24 system, TIOCGWINSZ is not available. This means that
any usage of the "hg" tool that looks up the terminal size (e.g. "hg
help") will fail with an AttributeError.
A simple work-around is just to wrap this block in mercurial/posix.py
with a try/except so that it ends up using the default 80 characters
width.
Martin Geisler <martin@geisler.net> [Sun, 13 May 2012 12:07:49 +0200] rev 16725
phases: wrap docstrings at 70 characters
Martin Geisler <martin@geisler.net> [Sun, 13 May 2012 12:06:12 +0200] rev 16724
phases: fix typos in docstrings
Levi Bard <levi@unity3d.com> [Sun, 13 May 2012 22:59:22 +0200] rev 16723
largefiles: don't attempt to clone all largefiles to non-local destinations
Matt Mackall <mpm@selenic.com> [Mon, 14 May 2012 12:56:43 +0200] rev 16722
hgweb: fix filediff base calculation
Previously, we were finding the most recent version of a file in a
changeset and comparing it against its first file parent. This was
wrong on three counts:
- it would show a diff in revisions where there was no change to a file
- it would show a diff when only the exec bit changed
- it would potentially compare against a much older changeset, which
could be very expensive if git-style rename detection was enabled
This compares the file in the current context with that context's
parent, which may result in an empty diff when looking at a file not
touched by the current changeset.
Brodie Rao <brodie@sf.io> [Sun, 13 May 2012 14:04:07 +0200] rev 16721
branches: improve performance by removing redundant operations
This refactors the branches command so it collects all the information it needs
about a branch in one pass over the branch map.
In particular, it fixes an issue where the command called repo.branchtags() to
get branch tips, and then used repo.branchheads() to get the closed/open
status. Both repo methods read the changelog to determine if the branch is
closed, resulting in extra, redundant I/O.
For the PyPy repo with 744 branches and 843 branch heads, this brings
hg branches over NFS from:
CallCount Recursive Total(ms) Inline(ms) module:lineno(function)
2427 0 0.9057 0.9057 <open>
2424 0 0.4096 0.4096 <method 'close' of 'file' objects>
2424 0 0.0476 0.0476 <method 'read' of 'file' objects>
1 0 0.0468 0.0468 mercurial.revlog:637(headrevs)
+1 0 0.0000 0.0000 +<len>
2422 0 0.0443 0.0443 <method 'seek' of 'file' objects>
2962 0 0.0337 0.0337 <zlib.decompress>
2491 0 1.8008 0.0322 mercurial.changelog:182(read)
+2491 0 1.6982 0.0315 +mercurial.revlog:881(revision)
+2488 0 0.0269 0.0134 +mercurial.changelog:28(decodeextra)
+4982 0 0.0085 0.0085 +<method 'split' of 'str' objects>
+4982 0 0.0274 0.0049 +mercurial.encoding:61(tolocal)
+2491 0 0.0039 0.0039 +<method 'index' of 'str' objects>
2491 0 1.6982 0.0315 mercurial.revlog:881(revision)
+2413 0 0.0112 0.0112 +mercurial.revlog:305(rev)
+2491 0 1.5315 0.0068 +mercurial.revlog:847(_chunkraw)
+2491 0 0.0414 0.0058 +mercurial.revlog:945(_checkhash)
+2491 0 0.0028 0.0028 +mercurial.revlog:349(flags)
+2491 0 0.0025 0.0025 +<mercurial.mpatch.patches>
2422 0 1.5089 0.0286 mercurial.revlog:818(_loadchunk)
+2422 0 0.4093 0.4093 +<method 'close' of 'file' objects>
+2422 0 0.0451 0.0451 +<method 'read' of 'file' objects>
+2422 0 0.0443 0.0443 +<method 'seek' of 'file' objects>
+2422 0 0.9703 0.0096 +mercurial.store:374(__call__)
+2422 0 0.0079 0.0069 +mercurial.revlog:810(_addchunk)
5804 0 0.0204 0.0204 mercurial.revlog:305(rev)
2426 0 0.9552 0.0177 mercurial.scmutil:218(__call__)
+2426 0 0.9057 0.9057 +<open>
+2426 0 0.0120 0.0083 +os.path:80(split)
+2426 0 0.0061 0.0049 +mercurial.scmutil:92(__call__)
Time: real 1.950 secs (user 0.560+0.000 sys 0.220+0.000)
down to:
CallCount Recursive Total(ms) Inline(ms) module:lineno(function)
1545 0 0.6035 0.6035 <open>
1542 0 0.2697 0.2697 <method 'close' of 'file' objects>
1 0 0.0547 0.0547 mercurial.revlog:637(headrevs)
+1 0 0.0000 0.0000 +<len>
1542 0 0.0389 0.0389 <method 'read' of 'file' objects>
1540 0 0.0316 0.0316 <method 'seek' of 'file' objects>
1853 0 0.0227 0.0227 <zlib.decompress>
1557 0 1.2131 0.0226 mercurial.changelog:182(read)
+1557 0 1.1398 0.0221 +mercurial.revlog:881(revision)
+1555 0 0.0199 0.0094 +mercurial.changelog:28(decodeextra)
+3114 0 0.0058 0.0058 +<method 'split' of 'str' objects>
+3114 0 0.0196 0.0035 +mercurial.encoding:61(tolocal)
+1557 0 0.0026 0.0026 +<method 'index' of 'str' objects>
1557 0 1.1398 0.0221 mercurial.revlog:881(revision)
+1557 0 1.0307 0.0047 +mercurial.revlog:847(_chunkraw)
+1557 0 0.0287 0.0040 +mercurial.revlog:945(_checkhash)
+1557 0 0.0018 0.0018 +<mercurial.mpatch.patches>
+1557 0 0.0018 0.0018 +mercurial.revlog:326(node)
+1557 0 0.0417 0.0013 +mercurial.revlog:857(_chunkbase)
1540 0 1.0147 0.0210 mercurial.revlog:818(_loadchunk)
+1540 0 0.2693 0.2693 +<method 'close' of 'file' objects>
+1540 0 0.0360 0.0360 +<method 'read' of 'file' objects>
+1540 0 0.0316 0.0316 +<method 'seek' of 'file' objects>
+1540 0 0.6487 0.0070 +mercurial.store:374(__call__)
+1540 0 0.0059 0.0052 +mercurial.revlog:810(_addchunk)
3192 0 0.0173 0.0173 mercurial.revlog:305(rev)
8184 0 0.0300 0.0147 <method 'decode' of 'str' objects>
+5204 0 0.0149 0.0048 +encodings.utf_8:15(decode)
+1 0 0.0004 0.0000 +encodings:71(search_function)
43 26 0.0147 0.0129 <__import__>
Time: real 1.390 secs (user 0.450+0.000 sys 0.170+0.000)