Loom

Merge lp://staging/~garyvdm/bzr-loom/pulllocal into lp://staging/bzr-loom

  1. pulllocal
  2. Merge into trunk
Proposed by Gary van der Merwe
Status: Merged
Merge reported by: Vincent Ladeuil
Merged at revision: not available
Proposed branch: lp://staging/~garyvdm/bzr-loom/pulllocal
Merge into: lp://staging/bzr-loom
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~garyvdm/bzr-loom/pulllocal
Reviewer Review Type Date Requested Status
Loom Developers Pending
Review via email: mp+6876@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Gary van der Merwe (garyvdm) wrote :

Bzr now supports pull --local. This unfortunately breaks bzr-loom. This patch fixes this.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'branch.py'
2--- branch.py 2009-04-15 20:04:03 +0000
3+++ branch.py 2009-05-29 07:35:43 +0000
4@@ -437,7 +437,8 @@
5
6 @needs_write_lock
7 def pull(self, source, overwrite=False, stop_revision=None,
8- run_hooks=True, possible_transports=None, _override_hook_target=None):
9+ run_hooks=True, possible_transports=None,
10+ _override_hook_target=None, local=False):
11 """Pull from a branch into this loom.
12
13 If the remote branch is a non-loom branch, the pull is done against the
14@@ -445,12 +446,14 @@
15 entire loom and the current thread set to the top thread.
16 """
17 if not isinstance(source, LoomSupport):
18+
19 return super(LoomSupport, self).pull(source,
20 overwrite=overwrite, stop_revision=stop_revision,
21 possible_transports=possible_transports,
22- _override_hook_target=_override_hook_target)
23+ _override_hook_target=_override_hook_target,
24+ local=local)
25 return _Puller(source, self).transfer(overwrite, stop_revision,
26- run_hooks, possible_transports, _override_hook_target)
27+ run_hooks, possible_transports, _override_hook_target, local)
28
29 @needs_read_lock
30 def push(self, target, overwrite=False, stop_revision=None,
31@@ -669,7 +672,8 @@
32 return result
33
34 def transfer(self, overwrite, stop_revision, run_hooks=True,
35- possible_transports=None, _override_hook_target=None):
36+ possible_transports=None, _override_hook_target=None,
37+ local=False):
38 """Implementation of push and pull"""
39 # pull the loom, and position our
40 pb = bzrlib.ui.ui_factory.nested_progress_bar()

Subscribers

People subscribed via source and target branches