Fri, 13 Jan 2012 01:19:08 +0100 tests: make qnew in test-mq-caches.t stable
Mads Kiilerich <mads@kiilerich.com> [Fri, 13 Jan 2012 01:19:08 +0100] rev 15885
tests: make qnew in test-mq-caches.t stable The unstable hashes did for other reasons not show up in the test output.
Fri, 13 Jan 2012 01:19:08 +0100 localrepo: remove spurious updatebranchcache return value
Mads Kiilerich <mads@kiilerich.com> [Fri, 13 Jan 2012 01:19:08 +0100] rev 15884
localrepo: remove spurious updatebranchcache return value - it was left over from the refactoring in d01e28657429.
Wed, 11 Jan 2012 02:29:56 +0100 mq: only save dirty files once when savedirty is called multiple times
Mads Kiilerich <mads@kiilerich.com> [Wed, 11 Jan 2012 02:29:56 +0100] rev 15883
mq: only save dirty files once when savedirty is called multiple times
Wed, 11 Jan 2012 02:29:56 +0100 mq: remove early wlock release in qnew
Mads Kiilerich <mads@kiilerich.com> [Wed, 11 Jan 2012 02:29:56 +0100] rev 15882
mq: remove early wlock release in qnew It seems like something that missed the refactoring in 97b734fb9c6f.
Wed, 11 Jan 2012 02:29:55 +0100 mq: use .invalidate to cancel dirty mq state when cancelling transaction
Mads Kiilerich <mads@kiilerich.com> [Wed, 11 Jan 2012 02:29:55 +0100] rev 15881
mq: use .invalidate to cancel dirty mq state when cancelling transaction Before the code optimistically relied on savedirty not being called a cancelled transaction. If it was called it could save incorrect data. Instead we now start using the invalidate method introduced in b169ba60eebe.
Wed, 11 Jan 2012 02:29:55 +0100 mq: make qsave implementation more explicit
Mads Kiilerich <mads@kiilerich.com> [Wed, 11 Jan 2012 02:29:55 +0100] rev 15880
mq: make qsave implementation more explicit It wasn't obvious from the code how qsave mocked around with .hg/patches and .hg/patches.? and what was going on. This makes it more explicit so it will survive future refactorings.
Wed, 11 Jan 2012 02:28:36 +0100 mq: consistently use boolean values for dirty flags
Mads Kiilerich <mads@kiilerich.com> [Wed, 11 Jan 2012 02:28:36 +0100] rev 15879
mq: consistently use boolean values for dirty flags
Wed, 11 Jan 2012 02:28:12 +0100 mq: minor cleanup
Mads Kiilerich <mads@kiilerich.com> [Wed, 11 Jan 2012 02:28:12 +0100] rev 15878
mq: minor cleanup
Fri, 13 Jan 2012 01:19:07 +0100 tag: lock before tagging
Mads Kiilerich <mads@kiilerich.com> [Fri, 13 Jan 2012 01:19:07 +0100] rev 15877
tag: lock before tagging
Fri, 13 Jan 2012 01:19:07 +0100 tests: lock before creating transaction in test-filelog
Mads Kiilerich <mads@kiilerich.com> [Fri, 13 Jan 2012 01:19:07 +0100] rev 15876
tests: lock before creating transaction in test-filelog
Fri, 13 Jan 2012 01:19:07 +0100 debugbuilddag: lock repo before starting transaction
Mads Kiilerich <mads@kiilerich.com> [Fri, 13 Jan 2012 01:19:07 +0100] rev 15875
debugbuilddag: lock repo before starting transaction
Fri, 13 Jan 2012 01:19:07 +0100 rebase: take locks in the right order
Mads Kiilerich <mads@kiilerich.com> [Fri, 13 Jan 2012 01:19:07 +0100] rev 15874
rebase: take locks in the right order repo.lock was taken before repo.wlock - that could in principle cause a deadlock.
Wed, 11 Jan 2012 01:56:05 +0100 tests: keep track of all check-code.py warnings
Mads Kiilerich <mads@kiilerich.com> [Wed, 11 Jan 2012 01:56:05 +0100] rev 15873
tests: keep track of all check-code.py warnings
Sun, 15 Jan 2012 13:39:09 +0100 filectx: typo in comment stable
Christian Ebert <blacktrash@gmx.net> [Sun, 15 Jan 2012 13:39:09 +0100] rev 15872
filectx: typo in comment
Sun, 15 Jan 2012 13:37:33 +0100 keyword: update filectx.cmp monkeypatch to handle '\1\n' at start of file stable
Christian Ebert <blacktrash@gmx.net> [Sun, 15 Jan 2012 13:37:33 +0100] rev 15871
keyword: update filectx.cmp monkeypatch to handle '\1\n' at start of file Analogous to 012b285cf643.
Wed, 11 Jan 2012 16:54:29 +0000 bugzilla: make XMLRPC interface support http and https access stable
Jim Hague <jim.hague@acm.org> [Wed, 11 Jan 2012 16:54:29 +0000] rev 15870
bugzilla: make XMLRPC interface support http and https access Inadvertently support is currently only for https. For some reason I thought xmlrpclib.SafeTransport did http and https, but it is https only. So create http and https XMLRPC transports that retain cookies. Decide which to use by inspecting the Bugzilla URL.
Fri, 13 Jan 2012 11:29:53 -0600 merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 13 Jan 2012 11:29:53 -0600] rev 15869
merge with stable
Fri, 13 Jan 2012 11:29:40 -0600 merge with i18n
Matt Mackall <mpm@selenic.com> [Fri, 13 Jan 2012 11:29:40 -0600] rev 15868
merge with i18n
Thu, 12 Jan 2012 17:50:48 +0700 i18n-ru: editorial for 'abort' and 'pipe'
Andrei Polushin <polushin@gmail.com> [Thu, 12 Jan 2012 17:50:48 +0700] rev 15867
i18n-ru: editorial for 'abort' and 'pipe'
Thu, 12 Jan 2012 02:12:00 +0700 i18n-ru: editorial for 'diff'
Andrei Polushin <polushin@gmail.com> [Thu, 12 Jan 2012 02:12:00 +0700] rev 15866
i18n-ru: editorial for 'diff' * * * i18n-ru: editorial for 'diff'
Thu, 12 Jan 2012 02:02:11 +0700 i18n-ru: editorial for 'guard'
Andrei Polushin <polushin@gmail.com> [Thu, 12 Jan 2012 02:02:11 +0700] rev 15865
i18n-ru: editorial for 'guard'
Wed, 11 Jan 2012 04:32:48 +0700 i18n-ru: vocabulary edited, minor corrections in translations.
Andrei Polushin <polushin@gmail.com> [Wed, 11 Jan 2012 04:32:48 +0700] rev 15864
i18n-ru: vocabulary edited, minor corrections in translations.
Wed, 11 Jan 2012 04:12:11 +0700 i18n-ru: using correct abbreviated units for megabytes.
Andrei Polushin <polushin@gmail.com> [Wed, 11 Jan 2012 04:12:11 +0700] rev 15863
i18n-ru: using correct abbreviated units for megabytes. See http://ru.wikipedia.org/wiki/МБ
Wed, 11 Jan 2012 18:14:55 +0100 help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com> [Wed, 11 Jan 2012 18:14:55 +0100] rev 15862
help: fix column alignment in "hg help" output The output of "hg help" is changed to ensure that the column containing descriptions of commands, extensions, and other topics is correctly alignmened.
Wed, 11 Jan 2012 18:08:25 +0100 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com> [Wed, 11 Jan 2012 18:08:25 +0100] rev 15861
minirst: simplify and standardize field list formatting The default width of field lists is changed from 12 to 14 to align minirst with the rst2html tool. Shrinking the width of the left column to fit the content is removed, to keep formatting simple and uniform.
Wed, 11 Jan 2012 16:53:51 +0100 largefiles: correctly download new largefiles when merging
Na'Tosha Bard <natosha@unity3d.com> [Wed, 11 Jan 2012 16:53:51 +0100] rev 15860
largefiles: correctly download new largefiles when merging There is a bug in the merge process where, if a new largefile is introduced in a merge and the user does not have that largefile in his repo's local store nor in his system cache, the working copy will retain the old largefile. Upon the commit of the merge, the standin is re-written to contain the hash of the old largefile, and the lfdirstate retains a "Modified" status for the file. The end result is that the largefile can show up in the merge commit as "Modified", but the standin has no diff. This is wrong in two ways: 1) Such a "wedged" history with a nonsense change in a commit should not be possible 2) It effectively reverts a largefile to an old version when doing a merge This is caused by the fact that the updatelfiles() command always checks the current largefile's hash against the hash stored in the current node's standin. This is correct behavior in every case except for a merge. When merging, we must assume that the standin in the working copy contains the correct hash, because the original hg.merge() has already updated it for us. This patch fixes the issue by patching the repo object to carry a "_ismerging" attribute, that the updatelfiles() command checks for. When this attribute is found, it checks against the working copy's standin, rather than the standin in the current node.
Wed, 11 Jan 2012 15:38:31 +0100 tests: add htmlcov option
Markus Zapke-Gründemann <info@keimlink.de> [Wed, 11 Jan 2012 15:38:31 +0100] rev 15859
tests: add htmlcov option
Thu, 12 Jan 2012 14:39:02 -0600 run-tests: use a list comprehension instead of map
Matt Mackall <mpm@selenic.com> [Thu, 12 Jan 2012 14:39:02 -0600] rev 15858
run-tests: use a list comprehension instead of map
Wed, 11 Jan 2012 15:37:25 +0100 tests: fix omit path list
Markus Zapke-Gründemann <info@keimlink.de> [Wed, 11 Jan 2012 15:37:25 +0100] rev 15857
tests: fix omit path list All directories need a trailing asterisk. Otherwise the files are not excluded from coverage.
Fri, 13 Jan 2012 14:52:47 +0100 commands: partial backout of fbb68b382040
Martin Geisler <mg@aragost.com> [Fri, 13 Jan 2012 14:52:47 +0100] rev 15856
commands: partial backout of fbb68b382040
(0) -10000 -3000 -1000 -300 -100 -50 -30 +30 +50 +100 +300 +1000 +3000 +10000 +30000 tip