Pierre-Yves David <pierre-yves.david@fb.com> [Sun, 17 May 2015 17:36:26 -0700] rev 25139
check-code: remove the check for os.path.relpath
This is available in Python2.6 the new default supported release.
Pierre-Yves David <pierre-yves.david@fb.com> [Sun, 17 May 2015 17:27:10 -0700] rev 25138
patch: remove duplicated import of cStringIO
It is already imported a couple of line above.
Augie Fackler <augie@google.com> [Mon, 18 May 2015 11:36:33 -0400] rev 25137
check-commit: print limit when user has a too-long summary
Anton Shestakov <engored@ya.ru> [Fri, 15 May 2015 20:04:24 +0800] rev 25136
paper: show branch/tags/bookmarks when blaming (issue3559)
Anton Shestakov <engored@ya.ru> [Fri, 15 May 2015 20:03:42 +0800] rev 25135
paper: show branch/tags/bookmarks when comparing (issue3559)
Anton Shestakov <engored@ya.ru> [Fri, 15 May 2015 20:02:41 +0800] rev 25134
paper: show branch/tags/bookmarks when diffing (issue3559)
Anton Shestakov <engored@ya.ru> [Fri, 15 May 2015 20:00:47 +0800] rev 25133
paper: show branch/tags/bookmarks when viewing (issue3559)
Anton Shestakov <engored@ya.ru> [Fri, 15 May 2015 18:17:36 +0800] rev 25132
paper: show branch/tags/bookmarks when browsing (issue3559)
Browse (or manifest) action allows browsing the directory structure at some
specified revision. In gitweb and monoblue styles, the revision header already
has branch/tag/bookmark information for the revision, but in paper style this
header was only showing tags. This patch adds branches and bookmarks.
Branch name needs to be obtained in this special way to be consistent with
regular changeset page, where in paper style default branch is never shown.
Yuya Nishihara <yuya@tcha.org> [Sat, 16 May 2015 21:42:09 +0900] rev 25131
revset: extract addset._iterordered to free function
It never uses self, so let's make it less dependent on variables.
Yuya Nishihara <yuya@tcha.org> [Sat, 16 May 2015 14:05:02 +0900] rev 25130
revset: use fastasc/fastdesc switch consistently in addset.__iter__
Yuya Nishihara <yuya@tcha.org> [Mon, 30 Mar 2015 20:56:37 +0900] rev 25129
revset: drop redundant filteredset from right-hand side set of "or" operation
Since 5548f558db3d, it should no longer be necessary because the addset can
remove duplicates correctly.
Pierre-Yves David <pierre-yves.david@fb.com> [Sun, 10 May 2015 05:11:13 -0700] rev 25128
getbundle: sort bundlecaps before exchanging then over the wire
The 'bundlecaps' argument is built as a set, we need to stabilise the order
before exchanging them. Otherwise, in the test, http logs are unstable when the
'bundlecaps' contains something (eg: using bundle2).
Pierre-Yves David <pierre-yves.david@fb.com> [Sun, 10 May 2015 04:39:11 -0700] rev 25127
hg-ssh: reject push earlier (on pretxnopen)
We now have a lock triggered for any transaction. We use it to ensure no-read
are made in read-only mode. We need more that just "no changegroup is added",
since bundle2 allows for more than just changegroup to be exchanged. We still
protect pushkey as it may write data without opening a transaction.
Pierre-Yves David <pierre-yves.david@fb.com> [Sun, 10 May 2015 03:06:00 -0700] rev 25126
test: test both bundle1 and bundle2 paths in 'test-push-hook-lock.t'
The locking scheme is a bit different in each cases. So we explicitly test each
case.
Pierre-Yves David <pierre-yves.david@fb.com> [Sat, 09 May 2015 23:40:40 -0700] rev 25125
progress: get the extremely verbose output out of default debug
When the progress extension is not enabled, each call to 'ui.progress' used to
issue a debug message. This results is a very verbose output and often redundant
in tests. Dropping it makes tests less volatile to factor they do not meant to
test.
We had to alter the sed trick in 'test-rename-merge2.t'. Sed is used to drop all
output from a certain point and hidding the progress output remove its anchor.
So we anchor on something else.
Anton Shestakov <engored@ya.ru> [Fri, 15 May 2015 11:52:39 +0800] rev 25124
hgweb: show changeset branches/tags/bookmarks in file log (style=monoblue)
As for the gitweb style, this line for filelogentry template is copied from
shortlogentry. No change to python code is needed. Tests are unaffected.
Anton Shestakov <engored@ya.ru> [Fri, 15 May 2015 11:42:09 +0800] rev 25123
hgweb: show changeset branches/tags/bookmarks in file log (style=gitweb)
This line for filelogentry template is copied from shortlogentry. The
information is already displayed in paper style, so no change to python code is
needed. Tests are unaffected.
Matt Harbison <matt_harbison@yahoo.com> [Sat, 16 May 2015 00:36:35 -0400] rev 25122
match: resolve filesets in subrepos for commands given the '-S' argument
This will work for any command that creates its matcher via scmutil.match(), but
only the files command is tested here (both workingctx and basectx based tests).
The previous behavior was to completely ignore the files in the subrepo, even
though -S was given.
My first attempt was to teach context.walk() to optionally recurse, but once
that was in place and the complete file list was built up, the predicate test
would fail with 'path in nested repo' when a file in a subrepo was accessed
through the parent context.
There are two slightly surprising behaviors with this functionality. First, any
path provided inside the fileset isn't narrowed when it is passed to the
subrepo. I dont see any clean way to do that in the matcher. Fortunately, the
'subrepo()' fileset is the only one to take a path.
The second surprise is that status predicates are resolved against the subrepo,
not the parent like 'hg status -S' is. I don't see any way to fix that either,
given the path auditor error mentioned above.
Matt Harbison <matt_harbison@yahoo.com> [Fri, 15 May 2015 23:13:05 -0400] rev 25121
subrepo: introduce getfileset()
This will be used in the next patch to help matchers resolve filesets in
subrepos. The default implementation returns an empty set (for git and svn).
Gilles Moris <gilles.moris@free.fr> [Fri, 15 May 2015 09:46:21 +0200] rev 25120
phase: default to current revision if no rev is provided (issue4666)
Martin von Zweigbergk <martinvonz@google.com> [Sun, 12 Apr 2015 23:51:06 -0700] rev 25119
treemanifest: add --dir option to debug{revlog,data,index}
It should be possible to debug the submanifest revlogs without having
to know where they are stored (in .hg/store/meta/), so let's add a
--dir option for this purpose.
Pierre-Yves David <pierre-yves.david@fb.com> [Sun, 10 May 2015 06:48:08 -0700] rev 25118
obsolete: sort obsmarkers during exchange
Because bundle2 allows a more precise exchange of obsmarkers during pull, it
sends them in a different order (previously unstable because of sets.) As
a result, they are added to the repository in a different order. To stabilize
the order and ensure tests are unchanged when moving from bundle1 to bundle2 we
sort markers when exchanging them.
In the long run, the obsstore will probably not use a linear storage.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 21 Apr 2015 12:01:34 +0200] rev 25117
test-discovery-legacy: disable bundle2 for legacy test
We need to disable the "bundle2" capability to ensure we stay on legacy
capability.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 21 Apr 2015 11:18:47 +0200] rev 25116
test-discovery: disable bundle2 for legacy test (issue4610)
We need to disable the "bundle2" capability to ensure we stay on legacy
capability.
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 15 May 2015 00:25:43 -0700] rev 25115
revset: fix iteration over ordered addset composed of non-ordered operands
Before this change, doing ordered iteration over an 'addset' object composed of
operands without fastasc or fastdesc method could result in duplicated entries.
This was the result of applying '_iterordered' on an unordered set.
We fix it by ensuring we iterate over the set in a sorted order. Using the fast
iterator when it exists on any operand. We kill the '_iterator' method in the
process because it did not make a lot of sense independently.
Thanks goes to Yuya Nishihara for reporting the issue and analysing the cause.
Drew Gottlieb <drgott@google.com> [Fri, 15 May 2015 15:43:26 -0700] rev 25114
match: add match.ispartial()
match.ispartial() will return the opposite of match.always() in core, but this
function will be extensible by extensions to produce another result even
if match.always() will be untouched.
This will be useful for narrowhg, where ispartial() will return False even if
the match won't always match. This would happen in the case where the only
time the match function is False is when the path is outside of the narrow
spec.
Martin von Zweigbergk <martinvonz@google.com> [Sat, 16 May 2015 11:28:04 -0700] rev 25113
util: drop alias for collections.deque
Now that util.deque is just an alias for collections.deque, let's just
remove it.
Adrian Buehlmann <adrian@cadifra.com> [Sat, 16 May 2015 09:03:21 +0200] rev 25112
util: kill Python 2.4 deque.remove hack
Gilles Moris <gilles.moris@free.fr> [Thu, 14 May 2015 17:38:38 +0200] rev 25111
summary: add a phase line (draft, secret) to the output
The number of draft and secret changesets are currently not summarized.
This is an important information because the number of drafts give some rough
idea of the number of outgoing changesets in typical workflows, without needing
to probe a remote repository. And a non-zero number of secrets means that
those changeset will not be pushed.
If the repository is "dirty" - some draft or secret changesets exists - then
summary will display a line like:
phases: X draft, Y secret (public)
The phase in parenthesis corresponds to the highest phase of the parents of
the working directory, i.e. the current phase.
By default, the line is not printed if the repository is "clean" - all
changesets are public - but if verbose is activated, it will display:
phases: (public)
On the other hand, nothing will be printed if quiet is in action.
A few tests have been added in test-phases.t to cover the -v and -q cases.
Anton Shestakov <engored@ya.ru> [Fri, 15 May 2015 12:19:51 +0800] rev 25110
hgweb: also display changeset bookmarks in file log (style=paper)
There already are branches and tags in file log, now let's add what's been
missing: bookmarks.
Also, since coal borrows this template from paper, this change is effective for
coal as well.
Anton Shestakov <engored@ya.ru> [Fri, 15 May 2015 13:30:34 +0800] rev 25109
tests: test branch/tag/bookmark display in test-hgweb-filelog.t
Displaying branches, tags and bookmarks is an obviously important feature of
hgweb and should be tested a bit more than not at all, so let's add a branch, a
tag and a bookmark to the test.
With this change it's evident that the default style (paper) doesn't show
bookmarks in filelog. Future patch will fix this.
Anton Shestakov <engored@ya.ru> [Fri, 15 May 2015 02:07:43 +0800] rev 25108
hgweb: split some long lines in paper, gitweb and monoblue styles
This will ease future patches for the templates.
As a result of this patch, paper style has one visual change in
log/shortlog/file log view: the spacing between commit message and the first
tag (or branch name, or bookmark) is now roughly who spaces wide instead of one
space wide. This spacing is consistent with the one between branch
names/tags/bookmarks themselves, so it looks better.
In gitweb style, the change from non-breakable space to regular space is
consistent with other elements.
In monoblue the change is not noticeable.