/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 contrib/upload-bzr.dev

  • Committer: Vincent Ladeuil
  • Date: 2009-04-27 16:10:10 UTC
  • mto: (4310.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4311.
  • Revision ID: v.ladeuil+lp@free.fr-20090427161010-7swfzeagf63cpixd
Fix bug #367726 by reverting some default user handling introduced
while fixing bug #256612.

* bzrlib/transport/ssh.py:
(_paramiko_auth): Explicitly use getpass.getuser() as default
user.

* bzrlib/transport/ftp/_gssapi.py:
(GSSAPIFtpTransport._create_connection): Explicitly use
getpass.getuser() as default user.

* bzrlib/transport/ftp/__init__.py:
(FtpTransport._create_connection): Explicitly use
getpass.getuser() as default user.

* bzrlib/tests/test_sftp_transport.py:
(TestUsesAuthConfig.test_sftp_is_none_if_no_config)
(TestUsesAuthConfig.test_sftp_doesnt_prompt_username): Revert to
None as the default user.

* bzrlib/tests/test_remote.py:
(TestRemoteSSHTransportAuthentication): The really offending one:
revert to None as the default user.

* bzrlib/tests/test_config.py:
(TestAuthenticationConfig.test_username_default_no_prompt): Update
test (and some PEP8).

* bzrlib/smtp_connection.py:
(SMTPConnection._authenticate): Revert to None as the default
user.

* bzrlib/plugins/launchpad/account.py:
(_get_auth_user): Revert default value handling.

* bzrlib/config.py:
(AuthenticationConfig.get_user): Fix doc-string. Leave default
value handling to callers.

Show diffs side-by-side

added added

removed removed

Lines of Context:
contrib/upload-bzr.dev
 
1
#! /bin/sh -ex
 
2
 
 
3
# example of how to upload a bzr tree using rsync
 
4
 
 
5
# --include-from is used to make sure that only versioned files and
 
6
# control files are copied.  We use includes/excludes rather than
 
7
# --files-from so that we can delete any files from the destination
 
8
# that are no longer present on the source.
 
9
 
 
10
cd ~/work/bzr 
 
11
 
 
12
# note: don't use -a because that can mess up the permissions
 
13
 
 
14
chmod a+rX `bzr inventory`
 
15
 
 
16
bzr inventory | 
 
17
rsync -rltv                                                         \
 
18
    .                                                               \
 
19
    escudero.ubuntu.com:/srv/www.bazaar-ng.org/rsync/bzr/bzr.dev/   \
 
20
    --include .bzr                                                  \
 
21
    --include '.bzr/**'                                             \
 
22
    --exclude-from .rsyncexclude                                    \
 
23
    --exclude-from .bzrignore                                       \
 
24
    --include-from -                                                \
 
25
    --exclude \*                                                    \
 
26
    --exclude '.*'                                                  \
 
27
    --delete-excluded --delete                                      \