Author: dobey
Revision Date: 2016-01-08 20:17:45 UTC

Fall back to unique_name for branch config if bzr_identity non-existent.

Author: Jelmer Vernooij
Revision Date: 2017-08-26 16:25:23 UTC

Fix a BzrDir reference.

Author: Vincent Ladeuil
Revision Date: 2016-12-15 10:11:23 UTC

Stop setting status to 'Merged' outsmarting launchpad which does a better job and provide better feedback averall.

This was added to limit the races when polling approved merge proposals but didn't completely avoid the issue anyway.

The real solution is to use webhooks.

Author: Vincent Ladeuil
Revision Date: 2016-07-21 12:23:19 UTC

Remove XXX, this was fixed ages ago.

Author: Vincent Ladeuil
Revision Date: 2016-07-11 14:52:15 UTC

Set the MP status to Merged after committing instead of waiting for lp to do so.

Author: Chad Smith
Revision Date: 2015-12-21 15:57:30 UTC

Merge tarmac/bugresolver-ignore-tags [r=adam-collard] [a=Chad Smith]
Add config option ignore_tags to bugresolver plugin to support feature bugs
ignore_tags defaults to 'no-sync', any cards with no-sync tag will not
transition to fix committed when tarmac lands a branch related to this bug.

Author: Chad Smith
Revision Date: 2015-12-21 15:57:30 UTC

Merge tarmac/bugresolver-ignore-tags [r=adam-collard] [a=Chad Smith]
Add config option ignore_tags to bugresolver plugin to support feature bugs
ignore_tags defaults to 'no-sync', any cards with no-sync tag will not
transition to fix committed when tarmac lands a branch related to this bug.

Author: Adam Collard
Revision Date: 2015-12-02 15:36:55 UTC

No need to walk next_collection links

Author: Joe Talbott
Revision Date: 2015-10-02 13:03:46 UTC

test.

Approved by Parameswaran Sivatharman.

Author: Joe Talbott
Revision Date: 2015-10-01 21:27:58 UTC

testing

Author: David Britton
Revision Date: 2015-09-29 16:17:46 UTC

Add artifacts_copy plugin. [r=free,sparkiegeek]

Author: David Britton
Revision Date: 2015-09-29 04:14:44 UTC

add section in docs explaining artifacts_copy.

Author: Para Siva
Revision Date: 2015-09-16 18:52:08 UTC

This is to test jlp trigger.

Approved by Ubuntu CI Bot.

Author: Para Siva
Revision Date: 2015-09-16 18:04:07 UTC

THis should pass

Author: Para Siva
Revision Date: 2015-09-16 08:57:46 UTC

Testing additional commit trigger

Author: Para Siva
Revision Date: 2015-08-12 11:20:12 UTC

Formatting

Author: Para Siva
Revision Date: 2015-08-07 22:22:23 UTC

Adding a list_all candidate MP's [r=Francis Ginther, Evan Dandrea]

Author: Para Siva
Revision Date: 2015-08-07 17:02:51 UTC

list_all do not need to be optional

Author: Joe Talbott
Revision Date: 2015-07-22 03:21:07 UTC

Add a 'test' command to identify MPs needing testing

Author: Zygmunt Krynicki
Revision Date: 2015-06-09 15:05:41 UTC

Ignore .pyc files

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>

Author: Vincent Ladeuil
Revision Date: 2014-11-14 08:51:12 UTC

Revert the controversial change.

Author: Vincent Ladeuil
Revision Date: 2014-11-13 14:38:20 UTC

Protect tarmac from being killed with verify_command is killed.
Add a verify_timeout for long commands.
Drive-by fix command.config.debug not being set.

Author: Evan
Revision Date: 2014-06-19 14:30:04 UTC

Build-depend on setuptools.

Author: dobey
Revision Date: 2014-06-04 01:40:30 UTC

Disconnect the transport immediately after opening the remote.

Author: David Britton
Revision Date: 2014-04-10 20:32:34 UTC

merge in commit-message-newline (missed forward port from ls-trunk-u1-trunk)

Author: David Britton
Revision Date: 2014-04-10 20:27:00 UTC

cherry pick -r423..426 from ls-trunk-u1-trunk: Commit message newline char

Author: David Britton
Revision Date: 2014-04-09 16:07:00 UTC

backport bin/tarmac from trunk, allows running out of the branch [trivial]

Author: David Britton
Revision Date: 2014-04-08 20:28:31 UTC

tests failing, but this should unblock testing

Author: David Britton
Revision Date: 2014-03-25 21:33:48 UTC

revert 4095

Author: David Britton
Revision Date: 2014-03-25 15:34:06 UTC

revert r409 for now

Author: David Britton
Revision Date: 2014-03-25 19:51:17 UTC

add elements to set one at a time.

Author: David Britton
Revision Date: 2014-03-25 15:34:06 UTC

revert r409 for now

Author: David Britton
Revision Date: 2014-03-13 22:15:00 UTC

Merging in milestone branch

Author: David Britton
Revision Date: 2014-03-12 22:38:54 UTC

Adding config 'default_milestone' and 'set_milestone' which control behavior.

Author: dobey
Revision Date: 2013-11-06 19:22:00 UTC

Fix package build and use ./run-tests to run the tests now.

Author: David Britton
Revision Date: 2013-09-20 21:10:39 UTC

revert to old cmp= sorting method which is more backward compatible

Author: David Britton
Revision Date: 2013-09-17 21:51:25 UTC

Merging up along u1-trunk

Author: David Britton
Revision Date: 2013-09-17 21:43:01 UTC

Adding lookup of bugs in the MP, unit tests to match

Author: David Britton
Revision Date: 2013-07-17 18:34:28 UTC

- update docs/introduction.txt to talk about prerequisite branch handling

Author: Go Bot
Revision Date: 2013-07-16 06:10:58 UTC

Get the test suite passing again.

Author: Paul Hummer
Revision Date: 2013-02-04 21:07:51 UTC

Wrap branch and tree locks in a finally to guarantee the .unlock will be called

Author: Diogo Matsubara
Revision Date: 2013-06-26 23:32:56 UTC

fix tarmac branch commit message

Author: Diogo Matsubara
Revision Date: 2013-05-17 21:12:26 UTC

actual last build number

Author: Graham Binns
Revision Date: 2013-05-07 23:23:32 UTC

Fixed the handling of unicode output from verify commands.

Author: mrazik
Revision Date: 2013-04-29 14:55:41 UTC

removed --fail-missing from install

Author: James Westby
Revision Date: 2013-03-13 16:50:01 UTC

Merge trunk.

Author: James Westby
Revision Date: 2013-01-31 20:03:28 UTC

Merged exit-status into check-command.

Author: James Westby
Revision Date: 2013-01-31 20:03:28 UTC

Merged break-up-do-merges into exit-status.

Author: James Westby
Revision Date: 2013-01-31 20:03:28 UTC

Merged commit-message into break-up-do-merges.

Author: James Westby
Revision Date: 2013-01-31 20:03:28 UTC

Merged utf8 into commit-message.

Author: James Westby
Revision Date: 2013-01-31 20:03:28 UTC

Merged setsid into utf8.

Author: James Westby
Revision Date: 2013-01-31 20:03:28 UTC

Merged branch-tree-properties into setsid.

Author: James Westby
Revision Date: 2013-01-24 21:04:59 UTC

Merged check-command into verify-command.

Author: Chris Glass
Revision Date: 2013-01-04 12:46:31 UTC

Made merging qith prerequisite look into the branches we already merged in this run as well as the
prerequisite status to determine if a branch can be merged.

Need to solve the approved revision numbers problem now.

Author: James Westby
Revision Date: 2012-11-15 16:06:29 UTC

Merge the check.py file.

Author: James Westby
Revision Date: 2012-01-23 22:22:16 UTC

pkgme-service needs fabric.

Author: Didier Roche
Revision Date: 2012-01-12 15:04:58 UTC

Adds support to the jenkins plugin for chaining jobs and waiting for the pipeline to complete.. Fixes: . Appoved by .

Author: Alex Launi
Revision Date: 2012-01-12 14:13:16 UTC

add bullshit 2

Author: Didier Roche
Revision Date: 2011-12-08 08:32:17 UTC

enabling requests to be http://. Only block if not present or contain BLOCKTARMAC keyword

Author: Didier Roche
Revision Date: 2011-12-06 14:34:23 UTC

commit WIP with a lot of debug message, but still having the issue of the branch/merge data not being reloaded… Will have a look later

Author: Didier Roche
Revision Date: 2011-12-05 08:12:22 UTC

pass the command config object in

Author: Didier Roche
Revision Date: 2011-12-05 07:45:21 UTC

push typo fixes and use format()

Author: Didier Roche
Revision Date: 2011-11-30 13:28:28 UTC

now that we have only one arg, make it simpler

Author: Didier Roche
Revision Date: 2011-11-29 16:31:44 UTC

ooppssss, use hasattr rather on an instance

Author: Didier Roche
Revision Date: 2011-11-23 13:28:44 UTC

add a jenkins plugin, to be able to connect tarmac to a jenkins job for a project

Author: Didier Roche
Revision Date: 2011-11-23 13:08:09 UTC

add pid detection to have only one tarmac at a time running with use_pid = True

Author: Zorba Build Bot
Revision Date: 2011-11-08 07:00:44 UTC

Update timeout; special-case Markos.

Author: Didier Roche
Revision Date: 2011-11-07 14:12:05 UTC

first jenkins plugin version with test mock server

Author: Kenneth Yrke Jørgensen
Revision Date: 2011-10-17 10:53:03 UTC

Changed convertion of unicode string and config load order

Author: Zorba Build Bot
Revision Date: 2011-10-10 21:21:34 UTC

1. Added "tarmac_test_merged" hook, which allows you to run tests on the merge
tree before any pre-commit hooks are invoked (in particular so you can run
tests before voting checks are done).
2. Added "candidate_branch_status" tarmac.conf option to specify what state
a Merge Proposal must be in for tarmac to attempt to land it.
3. Added ability to pass <source_branch> and <target_branch> options to
verify_command.

Author: Nigel Babu
Revision Date: 2011-06-22 09:50:42 UTC

Small fix for cron documentation

Author: Māris Fogels
Revision Date: 2011-01-11 15:06:51 UTC

Test commit

Author: Māris Fogels
Revision Date: 2011-01-10 22:32:23 UTC

Fixed calling the program defined by bundle_verify_command.

Author: Māris Fogels
Revision Date: 2011-01-10 22:32:23 UTC

Fixed calling the program defined by bundle_verify_command.

Author: Māris Fogels
Revision Date: 2011-01-10 22:02:31 UTC

Fixed a bug where you can not call a subprocess command with a 'rw' mode file. Cleaned up the function body a bit.

Author: Māris Fogels
Revision Date: 2011-01-07 14:15:08 UTC

Removed the previous attempt at fixing stale net connections, implemented an alternative fix.

Author: Diogo Matsubara
Revision Date: 2011-01-05 17:09:54 UTC

add persistent log for bundle merge runs

Author: Gary Poster
Revision Date: 2011-01-05 02:45:15 UTC

this is an attempt to fix the bzr push problem.

Author: Gary Poster
Revision Date: 2011-01-03 20:59:37 UTC

respond to review with fixes

Author: Diogo Matsubara
Revision Date: 2010-12-17 14:19:01 UTC

review comments: add XXX pointing to bug 691563 and fix small typo

Author: Māris Fogels
Revision Date: 2010-12-16 03:58:15 UTC

Fixed all API references to 'Needs review' and 'Work in progress'

Author: Diogo Matsubara
Revision Date: 2010-12-15 18:52:16 UTC

add python-subunit as a dependency

Author: Diogo Matsubara
Revision Date: 2010-12-15 16:52:26 UTC

merge from lp-tarmac and fix 1 conflict

Author: Māris Fogels
Revision Date: 2010-12-15 16:32:58 UTC

Stale code found by reviewer comments

Author: Māris Fogels
Revision Date: 2010-11-30 15:45:52 UTC

Added a new hook for checking individual branches pre-merge.

Author: Māris Fogels
Revision Date: 2010-11-29 17:09:47 UTC

Moved the pre-merge hook again so that TarmacMergeErrors are correctly processed by the pre-merge hook.

Author: Paul Hummer
Revision Date: 2010-11-29 13:21:08 UTC

just a test merge proposal

Author: Māris Fogels
Revision Date: 2010-11-29 05:27:48 UTC

Moved the pre-merge check code out into its own set of functions.

Author: Māris Fogels
Revision Date: 2010-11-29 04:46:39 UTC

Test merge

Author: Diogo Matsubara
Revision Date: 2010-11-25 17:03:32 UTC

break the test suite

Author: Diogo Matsubara
Revision Date: 2010-11-25 15:27:43 UTC

another change that won't break anything

Author: Diogo Matsubara
Revision Date: 2010-11-25 15:26:24 UTC

test a small change that won't break the test suite

Author: Diogo Matsubara
Revision Date: 2010-11-19 16:48:07 UTC

make all tests pass again

Author: Diogo Matsubara
Revision Date: 2010-11-19 16:55:29 UTC

add test to tarmac.branch.Branch.get_merge_proposals() and remove code from bin/commands that's already in tarmac/branch.py

Author: Diogo Matsubara
Revision Date: 2010-11-19 16:57:48 UTC

move most of the merge logic to the tarmac.branch.Branch class

Author: Diogo Matsubara
Revision Date: 2010-11-19 16:59:08 UTC

use BranchTestCase.make_branch() method to remove some code duplication

Author: Diogo Matsubara
Revision Date: 2010-11-19 17:01:11 UTC

possible solution to call tarmac pre and post commit hooks by making tarmac.branch.Branch.merge_branches() a generator and adds a test that shows the merge_branches() implementation with a generator actually works.

Author: dobey
Revision Date: 2010-11-16 20:22:47 UTC

Handle the KeyError with a better error when launchpad.people[team] fails
Use the team.getMembersByStatus API correctly and make multiple calls

Author: Soren Hansen
Revision Date: 2010-11-17 13:36:09 UTC

Add a one_at_a_time option to merge. This is useful if using tarmac from hudson, and you have dependent jobs that you want to run for each merged branch.