/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/_dirstate_helpers_c.h

  • Committer: Vincent Ladeuil
  • Date: 2007-09-10 12:12:47 UTC
  • mto: (2810.2.1 integration)
  • mto: This revision was merged to the branch mainline in revision 2813.
  • Revision ID: v.ladeuil+lp@free.fr-20070910121247-sxf4l4pq1e27380p
Fix #128076 and #131396 by reusing bound branch transport.

* bzrlib/bzrdir.py:
(BzrDir.open): Add possible_transports as the last parameter.

* bzrlib/builtins.py:
(cmd_update.run): Use possible_transports parameter to obtain the
master branch transport and reuse it.

* bzrlib/branch.py:
(Branch.open, Branch.get_master_branch,
BzrBranch5.get_master_branch, BzrBranch5.update): Add
possible_transports as the last parameter.

* bzrlib/workingtree.py:
(WorkingTree.update): Add possible_transports as the last parameter.

* bzrlib/tests/commands/test_update.py:
(TestUpdate.test_update): Ignore connections from bind.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/_dirstate_helpers_c.h
 
1
#ifndef _DIRSTATE_HELPERS_C_H
 
2
#define _DIRSTATE_HELPERS_C_H
 
3
 
 
4
/* for intptr_t */
 
5
#ifdef _MSC_VER
 
6
#include <io.h>
 
7
#else
 
8
#include <stdint.h>
 
9
#endif
 
10
 
 
11
#endif