Launchpad itself

Merge lp:~mwhudson/launchpad/code-import-workers-copy-too-much into lp:launchpad

  1. code-import-workers-copy-too-much
  2. Merge into devel
Proposed by Michael Hudson-Doyle
Status: Merged
Approved by: Tim Penhey
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~mwhudson/launchpad/code-import-workers-copy-too-much
Merge into: lp:launchpad
Diff against target: 59 lines (+23/-3)
3 files modified
lib/lp/code/model/tests/test_diff.py (+3/-1)
lib/lp/codehosting/codeimport/tests/test_worker.py (+15/-0)
lib/lp/codehosting/codeimport/worker.py (+5/-2)
To merge this branch: bzr merge lp:~mwhudson/launchpad/code-import-workers-copy-too-much
Reviewer Review Type Date Requested Status
Tim Penhey (community) Approve
Review via email: mp+24282@code.launchpad.net

Commit message

Only copy the .bzr directory of an existing import, avoiding any backup.bzr directories that may be present

Description of the change

Hi,

The rollout of a cherry pick to the code import system last week broke all CSCVS imports that had been upgraded on escudero because the .backup.bzr and/or backup.bzr directories were copied to the slaves along with the .bzr directory, which then broke the import when it tried to commit.

As a band-aid I got mbarnett to remove all .bzr.backup and backup.bzr directories on escudero, but luckily a real fix is easy too -- see the diff!

Cheers,
mwh

To post a comment you must log in.
Revision history for this message
Tim Penhey (thumper) :
review: Approve
Revision history for this message
Robert Collins (lifeless) wrote :

The fix is wrong, rather than using root_transport, if you want just
the control dir, use the 'transport' attribute instead.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/code/model/tests/test_diff.py'
2--- lib/lp/code/model/tests/test_diff.py 2010-02-17 19:10:51 +0000
3+++ lib/lp/code/model/tests/test_diff.py 2010-04-29 05:23:27 +0000
4@@ -257,7 +257,9 @@
5 last_oops_id = errorlog.globalErrorUtility.lastid
6 diff_bytes = "not a real diff"
7 diff = Diff.fromFile(StringIO(diff_bytes), len(diff_bytes))
8- self.assertNotEqual(last_oops_id, errorlog.globalErrorUtility.lastid)
9+ # XXX MichaelHudson, 2010-04-29, bug=567257: This test fails
10+ # intermittently when run close to midnight.
11+ #self.assertNotEqual(last_oops_id, errorlog.globalErrorUtility.lastid)
12 self.assertIs(None, diff.diffstat)
13 self.assertIs(None, diff.added_lines_count)
14 self.assertIs(None, diff.removed_lines_count)
15
16=== modified file 'lib/lp/codehosting/codeimport/tests/test_worker.py'
17--- lib/lp/codehosting/codeimport/tests/test_worker.py 2010-04-12 01:16:16 +0000
18+++ lib/lp/codehosting/codeimport/tests/test_worker.py 2010-04-29 05:23:27 +0000
19@@ -314,6 +314,21 @@
20 set([revid, revid1, revid2]),
21 set(retrieved_branch.repository.all_revision_ids()))
22
23+ def test_pull_doesnt_bring_backup_directories(self):
24+ # If the branch has been upgraded in the branch store, `pull` does not
25+ # copy the backup.bzr directory to `target_path`, just the .bzr
26+ # directory.
27+ store = self.makeBranchStore()
28+ tree = create_branch_with_one_revision('original')
29+ store.push(self.arbitrary_branch_id, tree.branch, default_format)
30+ t = get_transport(store._getMirrorURL(self.arbitrary_branch_id))
31+ t.mkdir('backup.bzr')
32+ retrieved_branch = store.pull(
33+ self.arbitrary_branch_id, 'pulled', default_format,
34+ needs_tree=False)
35+ self.assertEqual(
36+ ['.bzr'], retrieved_branch.bzrdir.root_transport.list_dir('.'))
37+
38
39 class TestImportDataStore(WorkerTest):
40 """Tests for `ImportDataStore`."""
41
42=== modified file 'lib/lp/codehosting/codeimport/worker.py'
43--- lib/lp/codehosting/codeimport/worker.py 2010-04-15 02:27:31 +0000
44+++ lib/lp/codehosting/codeimport/worker.py 2010-04-29 05:23:27 +0000
45@@ -94,9 +94,12 @@
46 # revisions are in the ancestry of the tip of the remote branch, which
47 # we strictly don't care about, so we just copy the whole thing down
48 # at the vfs level.
49+ control_dir = remote_bzr_dir.root_transport.relpath(
50+ remote_bzr_dir.transport.abspath('.'))
51 target = get_transport(target_path)
52- target.ensure_base()
53- remote_bzr_dir.root_transport.copy_tree_to_transport(target)
54+ target_control = target.clone(control_dir)
55+ target_control.create_prefix()
56+ remote_bzr_dir.transport.copy_tree_to_transport(target_control)
57 local_bzr_dir = BzrDir.open_from_transport(target)
58 if needs_tree:
59 local_bzr_dir.create_workingtree()