Home - Waterfall Grid T-Grid Console Builders Recent Builds Buildslaves Changesources - JSON API - About

Console View

Legend:   Passed Failed Failed Again Running Exception Offline No data

Augie Fackler
obsolete: avoid 2-argument form of enumerate, which was new in Python 2.6
  • fedora builder: make docker-fedora failed -  stdio
  • centos6 builder: make docker-centos6 failed -  stdio
Augie Fackler
repoview: use util.sha1() instead of hashlib.sha1()

45b5cd948a4d accidentally broke Python 2.4 compatibility, this fixes it.
Pierre-Yves David
debugobsolete: display parents information from markers

Now that we have a new field, we needs a way to visualize it.
Pierre-Yves David
obsmarkers: add a `parentnodes` method to retrieve parents information
Pierre-Yves David
obsstore: also store the 'parents' field on disk

We now store the `parents` field on disk. We use the same strategy as for
`date`: We stick it into the metadata. This is slow and dirty, but this is also
the only way we currently have.

At some point we'll have a new obsstore format to store this properly.
Pierre-Yves David
obsstore: drop 'date' from the metadata dictionnary

We are extracting the `date` information from the metadata at read time.
However we failed to remove it from the metadata returned in the markers. This
is now fixed.
Pierre-Yves David
createmarkers: automatically record the parent of pruned changeset

We need this information to build the set of relevant markers during exchanges. This can only be done at `createmarkers` level since the `obsstore.create` function does not have a repo have therefore not access to the parent information.
Pierre-Yves David
obsstore: add a `parents` argument to obsstore.create

We needs a way to pass the information to the function. Some guru told me that
what's arguments are made for.
Pierre-Yves David
obsstore: add a `parents` field

This field is intended to store the parent of the precursor. This is useful to
attach pruned changesets to a set of exchanged changesets. We currently just
add the fields with a None value. None stand for "no data recorded".
Pierre-Yves David
obsstore: add some documentation about the marker fields

As the number of field growth it makes sense to start documenting their contents.
FUJIWARA Katsunori
transplant: change "editform" to distinguish merge commits from others

"editform" argument for "getcommiteditor" is decided according to the
format below:

  EXTENSION[.COMMAND][.ROUTE]

  - EXTENSION: name of extension
  - COMMAND: name of command, if there are two or more commands in EXTENSION
  - ROUTE: name of route, if there are two or more routes in COMMAND

This patch newly adds "normal" and "merge" as ROUTE, to distinguish
merge commits from other.

This patch adds 4 test patterns to test combination of "merge"(x2) and
"--continue"(x2).
FUJIWARA Katsunori
rebase: change "editform" to distinguish merge commits from others

"editform" argument for "getcommiteditor" is decided according to the
format below:

  EXTENSION[.COMMAND][.ROUTE]

  - EXTENSION: name of extension
  - COMMAND: name of command, if there are two or more commands in EXTENSION
  - ROUTE: name of route, if there are two or more routes in COMMAND

This patch newly adds "merge" as ROUTE, to distinguish merge commits
from other.

This patch passes bool as "ctxorbool" to "mergeeditform", because
working context has always 2 parents at this point. Dropping the
second parent of non-merging commits is executed in "concludenode".

Unlike other patches in this series (e.g. for "hg commit"), this patch
doesn't add "normal.normal"/"normal.merge" style ROUTEs, because there
is no "merge" case in "collapse" ROUTE.
FUJIWARA Katsunori
import: change "editform" to distinguish merge commits from others

"editform" argument for "getcommiteditor" is decided according to the
format below:

  COMMAND[.ROUTE]

  - COMMAND: name of command
  - ROUTE: name of route, if there are two or more routes in COMMAND

This patch uses "normal.normal" and "normal.merge" as ROUTE of
"editform" instead of "normal", to distinguish merge commits from
other in "hg import" without "--bypass" case.

This patch assumes "editform" variations for "hg import" below:

    import.normal.normal
    import.normal.merge
    import.bypass.normal
    import.bypass.merge

Unlike other patches in this series, this patch uses "editor.sh"
instead of "checkeditform.sh" for the name of the script to check
"HGEDITFORM", because it has to do more than checking "HGEDITFORM".

To invoke editor forcibly in "test-import-merge.t", this patch creates
the patch not having patch description as "merge.nomsg.diff".
FUJIWARA Katsunori
commit: change "editform" to distinguish merge commits from other (--amend)

"editform" argument for "getcommiteditor" is decided according to the
format below:

  COMMAND[.ROUTE]

  - COMMAND: name of command
  - ROUTE: name of route, if there are two or more routes in COMMAND

This patch uses "amend.normal" and "amend.merge" as ROUTE of
"editform" instead of "amend", to distinguish merge commits from other
in "hg commit --amend" case.
FUJIWARA Katsunori
commit: change "editform" to distinguish merge commits from others

"editform" argument for "getcommiteditor" is decided according to the
format below:

  COMMAND[.ROUTE]

  - COMMAND: name of command
  - ROUTE: name of route, if there are two or more routes in COMMAND

This patch uses "normal.normal" and "normal.merge" as ROUTE of
"editform" instead of "normal", to distinguish merge commits from
others in "hg commit" without "--amend" case.

This patch assumes "editform" variations for "hg commit" below:

    commit.normal.normal
    commit.normal.merge
    commit.amend.normal
    commit.amend.merge

"mergeeditform" is factored out for subsequent patches. It takes
"ctxorbool" argument, because context object can't be passed in some
cases.
Gregory Szorc
test-ssh: verify that stderr from remote is printed (issue4336)

The issue fixed in the previous patch was uncovered by implementing an
extension that printed additional output locally before the push command
completed. This test emulates that.

If this change is applied before the previous patch, the test will fail
on Linux, with the local output being printed before the "remote: "
lines.
Gregory Szorc
posix: implement readpipe using non-blocking I/O (issue4336)

On Linux, fstat().st_size of a pipe always returns 0, even if the
pipe has data available for reading. This meant that reading from
and subsequently printing the stderr pipe content after wireproto
commands over SSH meant that available data wasn't being printed.

We now implement pipe reading on POSIX by doing a non-blocking
read for all available data.
Gregory Szorc
platform: implement readpipe()

Reading all available data from a pipe has a platform-dependent
implementation.

This patch establishes platform.readpipe() by copying the
inline implementation in sshpeer.readerr(). The implementations
for POSIX and Windows are currently identical. The POSIX
implementation will be changed in a subsequent patch.
Pierre-Yves David
exchange: remove duplicated addition to pushop.stepdone

Not sure how it got there but it is useless.
Augie Fackler
exchange: drop superfluous parens
Pierre-Yves David
push: add bookmarks to the unified bundle2 push

We use the `pushkey` part to exchange bookmark updates within the unified
bundle2 push. Note that this only applies on update (moving a bookmark known on both
sides) since bookmark export (creation of a new bookmark on remote) is apparently
done outside of the _push function.
Pierre-Yves David
test-bundle2: add bookmark movement to the push test

If we add bookmarks to bundle2, we need a way to test the new code.
Tests are changed beforehand to highlight that inclusion of bookmarks in bundle
does not introduce any behavior changes.
Pierre-Yves David
push: use stepsdone to control bookmark push

If bookmark are to be integrated in the unified bundle2, we need a way to disable
the old-style push.
Pierre-Yves David
push: move bookmark discovery with other discovery steps

The discovery of necessary bookmark updates is now done within the "discovery
phase". This opens the door to the inclusion of bookmarks in a unified bundle2
push.
Pierre-Yves David
pushbookmark: split an ultra-long line into a saner version

We make a temporary variable for the remote bookmark data and we do not expand
all elements from `bookmark.compare` since we are going to use only one.