David Soria Parra <dsp@php.net> [Sun, 13 May 2012 11:55:42 +0200] rev 16708
merge: respect bookmarks during merge
Bookmarks will behave more like named branches when merge tries to pick
a revision to merge.
Bookmarks now to respect the current bookmarks. Bookmarks will not
accidentally merged with unnamed heads or other bookmarks. However merge
can pick heads with diverging bookmarks and pick those automatically.
We end up with two cases for picking a revision to merge:
(1) In case of an current bookmark, merge can pick a branch head that has a
diverged bookmark
(2) In case of no current bookmark, merge can pick a branch head that does not
have a bookmark.
David Soria Parra <dsp@php.net> [Sun, 13 May 2012 11:54:58 +0200] rev 16707
localrepo: introduce bookmarkheads
Similar to branch heads we introduce the notion of bookmarkheads.
Bookmarkheads are changests that are bookmarked with the given bookmark
or a diverged version
David Soria Parra <dsp@php.net> [Sat, 12 May 2012 21:28:10 +0200] rev 16706
bookmarks: delete divergent bookmarks on merge
Brodie Rao <brodie@sf.io> [Sun, 13 May 2012 13:18:06 +0200] rev 16705
check-code: ignore naked excepts with a "re-raise" comment
This also promotes the naked except check from a warning to an error.
Brodie Rao <brodie@sf.io> [Sun, 13 May 2012 13:17:50 +0200] rev 16704
check-code: improve detection of naked except clauses
Brodie Rao <brodie@sf.io> [Sun, 13 May 2012 13:17:31 +0200] rev 16703
cleanup: replace more naked excepts with more specific ones
Brodie Rao <brodie@sf.io> [Sun, 13 May 2012 13:17:27 +0200] rev 16702
check-code: promote 80+ character line warning to an error
Patrick Mezard <patrick@mezard.eu> [Sun, 13 May 2012 13:19:46 +0200] rev 16701
cmdutil: use filectx.cmp() in amend()
Na'Tosha Bard <natosha@unity3d.com> [Sat, 12 May 2012 15:41:27 +0200] rev 16700
largefiles: optimize performance when updating (issue3440)
Previously, when updating, cachelfiles was called blindly on all largefiles
in the repository at the revision being updated to, despite the fact that
a list of which largefiles needs to be updated has already been collected. This
optimization constrains the cachelfiles call to only the largefiles that need
to be updated.
On a repository with about 80 largefiles, updating between two revisions that
only change one largefile goes from approximately 6.7 seconds to 3.3 seconds.
Matt Mackall <mpm@selenic.com> [Sun, 13 May 2012 12:52:24 +0200] rev 16699
merge with stable