Matt Mackall <mpm@selenic.com> [Wed, 02 Jan 2013 00:24:28 -0600] rev 18206
merge with stable
Matt Mackall <mpm@selenic.com> [Wed, 02 Jan 2013 00:07:43 -0600] rev 18205
Added signature for changeset a4765077b65e
Matt Mackall <mpm@selenic.com> [Wed, 02 Jan 2013 00:07:40 -0600] rev 18204
Added tag 2.4.2 for changeset a4765077b65e
Matt Mackall <mpm@selenic.com> [Wed, 02 Jan 2013 00:03:31 -0600] rev 18203
merge with i18n
Matt Mackall <mpm@selenic.com> [Wed, 02 Jan 2013 00:02:22 -0600] rev 18202
merge i18n heads
Angel Ezquerra <angel.ezquerra@gmail.com> [Thu, 20 Dec 2012 19:22:12 +0100] rev 18201
hgweb, paper: add (Atom) subscribe links to the repository index
This is similar to the subscribe links that already exist in other templates.
Rather than the usual RSS and Atom links a single feed icon linking to the
atom-log is shown.
Angel Ezquerra <angel.ezquerra@gmail.com> [Tue, 04 Dec 2012 00:41:29 +0100] rev 18200
hgweb: add (Atom) subscribe link to the main paper template pages
The subscribe link is found at the bottom of the navigation sidebar.
This uses a free icon from http://feedicons.com.
Augie Fackler <raf@durin42.com> [Mon, 31 Dec 2012 21:50:35 -0600] rev 18199
test-command-template.t: fix test so it all year
This test started failing for me after midnight UTC on December
31st. Fixed it by specifying a date 7 years in the future more
precisely (rather than just adding 8 to the year and specifying
January 1st), which allows the test to pass both now and on 2012-12-01
at the same time.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sun, 30 Dec 2012 03:49:15 +0100] rev 18198
amend: prevent loss of bookmark on failed amend
The active bookmark were moved to the temporary commit. When the transaction
were rollbacked, the bookmark were lost.
We now temporarly disable the bookmark to prevent this effect.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 29 Dec 2012 18:00:18 +0100] rev 18197
amend: invalidate dirstate in case of failure (issue3670)
The temporary commit created by amend update the dirstate. If the final commit
fails, we need to invalidate the change made to the dirstate, otherwise the
release of the wlock will write the dirstate created after the rollbacked
temporary commit.
This dirstate writing logic should probably be handled in the same object than
the transaction one. However such change are too big for stable.
Nikolaj Sjujskij <sterkrig@myopera.com> [Sat, 24 Nov 2012 01:40:39 +0400] rev 18196
i18n-ru: delete loose letter
Alexander Sauta <demosito@gmail.com> [Thu, 27 Dec 2012 07:32:51 +0000] rev 18195
i18n-ru: synchonized with 777084ac8416
Matt Mackall <mpm@selenic.com> [Thu, 20 Dec 2012 16:36:45 -0600] rev 18194
paper: sanity-check page feed links
filelog has feeds in header, but not in menu bar
help has header feeds pointing to tags
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 30 Dec 2012 19:19:52 +0100] rev 18193
zeroconf: use port from server instead of picking port from config (issue3746)
In order to get the port, wrap create server instead of
hgweb_mod/hgwebdir_mod.
Matt Mackall <mpm@selenic.com> [Thu, 20 Dec 2012 15:52:23 -0600] rev 18192
scmutil: don't try to match modes on filesystems without modes (issue3740)
Matt Mackall <mpm@selenic.com> [Sat, 22 Dec 2012 18:11:51 -0600] rev 18191
hgwebdir: honor web.templates and web.static for static files (issue3734)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 30 Dec 2012 19:19:52 +0100] rev 18190
zeroconf: use port from server instead of picking port from config (issue3746)
In order to get the port, wrap create server instead of
hgweb_mod/hgwebdir_mod.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 24 Dec 2012 03:21:15 +0100] rev 18189
branchmap: enable caching for filtered version too
The `_branchcache` attribute is turned into a dictionary. Key are filter name and
value is a `branchcache` object. Unfiltered version is cached as `None` filter.
The attribute is renamed to `_branchcaches` to avoid confusion with the previous
one. Both old and new contents are dictionary even if their contents are
different. I prefer possible extension code to crash right away instead of just
messing the wrong dictionary.
As all different caches work isolated to each other, this code keeps the
previous behavior of using the unfiltered cache we nothing is filtered. This
is a cheap way to have cache collaborate and nullify potential impact in the
default case.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 01 Jan 2013 21:27:13 +0100] rev 18188
branchmap: report filtername when read fails
Now that we can have multiple one, we need to know which filecache failed to be
read from disk.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 24 Dec 2012 03:06:03 +0100] rev 18187
branchmap: use a different file name for filtered view of repo
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 24 Dec 2012 03:05:02 +0100] rev 18186
clfilter: ensure unfiltered repo have a filtername attribute too
That will allows to use `repo.filtername` for dispatch purpose.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 24 Dec 2012 03:04:12 +0100] rev 18185
branchmap: move the cache file name into a dedicated function
Filtered view of the repo will want to write they file name in a different file.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 01 Jan 2013 18:19:24 +0100] rev 18184
branchmap: read and write key part related to filtered revision
Now that we have a third part for the cache key we need to write and read it on
disk. It is only written when there is filtered revision. This keep the format
compatible with older version.
Notes that, at this state, filtered repository does not use any disk caches yet.
Augie Fackler <raf@durin42.com> [Tue, 01 Jan 2013 13:05:22 -0600] rev 18183
check-code: disallow defunct <> operator
Added a test for that and one other python3 check in
test-check-code.t.
Augie Fackler <raf@durin42.com> [Tue, 01 Jan 2013 13:04:40 -0600] rev 18182
largefiles: stop using <> operator in favor of !=
<> has been deprecated for a while, and != is futureproof
Augie Fackler <raf@durin42.com> [Tue, 01 Jan 2013 13:18:33 -0600] rev 18181
commands: fix implicit tuple that is invalid syntax in Python3
Augie Fackler <raf@durin42.com> [Tue, 01 Jan 2013 12:58:21 -0600] rev 18180
check-code: disallow two-argument form of raise
Using this old form makes any attempt to port to Python 3 harder, and
the new syntax is supported in 2.4 already.
Augie Fackler <raf@durin42.com> [Tue, 01 Jan 2013 13:25:07 -0600] rev 18179
httpclient: apply change df9aea1def3e: remove use of two-argument raise
Augie Fackler <raf@durin42.com> [Tue, 01 Jan 2013 13:21:15 -0600] rev 18178
test-symlink-os-yes-fs-no.py: clean up use of two-argument raise
This makes any attempt to port to Python 3 harder, and the new syntax
is supported in 2.4 already.
Augie Fackler <raf@durin42.com> [Tue, 01 Jan 2013 12:51:00 -0600] rev 18177
scmutil: clean up use of two-argument raise
This makes any attempt to port to Python 3 harder, and the new syntax
is supported in 2.4 already.
Augie Fackler <raf@durin42.com> [Tue, 01 Jan 2013 12:50:46 -0600] rev 18176
url: clean up use of two-argument raise
This makes any attempt to port to Python 3 harder, and the new syntax
is supported in 2.4 already.
Augie Fackler <raf@durin42.com> [Tue, 01 Jan 2013 12:50:23 -0600] rev 18175
win32: clean up use of two-argument raise
This makes any attempt to port to Python 3 harder, and the new syntax
is supported in 2.4 already.
Augie Fackler <raf@durin42.com> [Tue, 01 Jan 2013 12:50:04 -0600] rev 18174
commandserver: clean up use of two-argument raise
This makes any attempt to port to Python 3 harder, and the new syntax
is supported in 2.4 already.
Augie Fackler <raf@durin42.com> [Mon, 31 Dec 2012 21:50:35 -0600] rev 18173
test-command-template.t: fix test so it all year
This test started failing for me after midnight UTC on December
31st. Fixed it by specifying a date 7 years in the future more
precisely (rather than just adding 8 to the year and specifying
January 1st), which allows the test to pass both now and on 2012-12-01
at the same time.
Siddharth Agarwal <sid0@fb.com> [Fri, 28 Dec 2012 16:25:12 -0800] rev 18172
cmdutil: make getgraphlogrevs limit-aware
For a repository with over 400,000 changesets, this speeds up graphlog with a
small limit by around 0.05 seconds (~50%).
Siddharth Agarwal <sid0@fb.com> [Fri, 28 Dec 2012 16:25:00 -0800] rev 18171
cmdutil: stop pretending we can calculate revs for graphlog lazily
cmdutil.getgraphlogrevs does a ton of work trying to build a graphlog lazily,
and then cmdutil.graphlog comes along and destroys all of that.
graphmod.dagwalker requires that it be given the full list of revs upfront so
that it can perform filtering and tests against known revs.
For a repository with over 400,000 changesets, this speeds up graphlog by
around 0.02 seconds (~20% with a small limit).
Siddharth Agarwal <sid0@fb.com> [Fri, 28 Dec 2012 16:24:36 -0800] rev 18170
cmdutil: store a local ref to repo.hiddenrevs in getgraphlogrevs
On a repository with over 400,000 changesets, this speeds graphlog up by
around 0.03 seconds (~20% with a small limit).
Siddharth Agarwal <sid0@fb.com> [Fri, 28 Dec 2012 14:46:58 -0800] rev 18169
cmdutil: make getgraphlogrevs return revs in descending order
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 31 Dec 2012 18:11:18 -0600] rev 18168
branchmap: takes filtered revision in account for cache calculation
Tracking tipnode and tiprev is not enough to ensure validaty of the cache as
they do not help distinguish a cache that ignored various revisions below
tiprev.
To detect such difference, we build a hash of all ignored revisions. This hash
is then used when checking the validity of a cache for a repo.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 24 Dec 2012 02:57:23 +0100] rev 18167
branchmap: improve computation of target tip
With revision filtering the effective revision number of "tip" may be lower than:
len(changelog) - 1
We now use a more correct version preventing useless writing on disk in some
case.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 28 Dec 2012 00:13:32 +0100] rev 18166
branchmap: improve invalid cache message when reading
This factors out the generation of the message. This helps future error reporting
when reading cache for filtered repository.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 31 Dec 2012 17:46:22 -0600] rev 18165
histedit: allow operation from non-head if obsolete is enabled
Obsolescence markers can represent this situation just fine. Rewritten
revisions are marked as precursors of the ones creates by
histedit. Unaffected descendants become "unstable".
If obsolescence is not enabled we keep the current behavior of
aborting. This new behavior only applies when obsolete is
enabled and is subject to future discussion and changes.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 31 Dec 2012 17:45:52 -0600] rev 18164
rebase: allow non-head rebase-set when obsolete is enabled
Obsolescence markers can represent this situation just fine. Rebased
revisions are marked as precursors of the ones create by
rebase. Unrebased descendants becomes "unstable".
If obsolescence is not enabled we keep the current behavior of
aborting. This new behavior only applies when obsolete is
enabled and is subject to future discussion and changes.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 31 Dec 2012 17:44:18 -0600] rev 18163
amend: allow amend of non-head when obsolete is enabled
Obsolescence marker can represent this situation just fine. The old
version is marked as precursor of the new changeset. All its
descendants become "unstable".
If obsolescence is not enabled we keep the current behavior of
aborting. This new behavior only applies when obsolete is
enabled and is subject to future discussion and changes.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 21 Dec 2012 22:58:59 +0100] rev 18162
obsolete: factorise troubles detection during push
The use of the two methods introduced earlier allows a factorisation of the
push code preventing push of troubled changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 17 Dec 2012 15:17:54 +0100] rev 18161
obsolete: introduce a troubles method on context
A troubled changeset may be affected by multiple trouble at the same time. This
new method returns a list of all troubles affecting a changes.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 17 Dec 2012 15:06:15 +0100] rev 18160
obsolete: introduce a troubled method on context
Allows to quickly check if a changeset is affected by any troubles.
(troubles are: unstable, bumped and divergent)
Mads Kiilerich <madski@unity3d.com> [Fri, 28 Dec 2012 14:22:24 +0100] rev 18159
tests: fix windows test failures