Merge tag 'upstream/0.1.36'
Upstream version 0.1.36
Leopold Palomo-Avellaneda
9 years ago
| 14 | 14 |
# precise
|
| 15 | 15 |
- HG='2.0.2' BZR=2.5.0 GIT=v1.7.9.5 SVN=1.6.17 PYYAML=3.10
|
| 16 | 16 |
# quantal
|
| 17 | |
- HG='2.2.2' BZR=2.6.0~beta2 GIT=v1.7.10.4 SVN=1.7.5 PYYAML=3.10
|
|
17 |
- HG='2.2.2' BZR=2.6.0+bzr6595 GIT=v1.7.10.4 SVN=1.7.5 PYYAML=3.10
|
| 18 | 18 |
# bzr 2.1.1 only builds with python 2.6
|
| 19 | 19 |
matrix:
|
| 20 | 20 |
exclude:
|
|
| 27 | 27 |
before_install:
|
| 28 | 28 |
- export REPO=`pwd`
|
| 29 | 29 |
install:
|
|
30 |
- sudo apt-get update
|
| 30 | 31 |
- sudo apt-get install -qq python3-yaml python3-dev
|
| 31 | 32 |
- sudo apt-get install -qq libapr1 libapr1-dev libaprutil1 libaprutil1-dev libneon27 libneon27-dev libc6-dev g++ gcc
|
| 32 | 33 |
- echo $PYTHONPATH
|
| 2 | 2 |
|
| 3 | 3 |
0.1
|
| 4 | 4 |
===
|
|
5 |
|
|
6 |
0.1.36
|
|
7 |
------
|
|
8 |
|
|
9 |
- Updates to the release platforms (-lucid +utopic +vivid)
|
|
10 |
- Fix an issue with updating branches on git, see vcstools/wstool#25
|
| 5 | 11 |
|
| 6 | 12 |
0.1.31
|
| 7 | 13 |
------
|
| 0 | |
version = '0.1.35'
|
|
0 |
version = '0.1.36'
|
| 268 | 268 |
same_branch = True
|
| 269 | 269 |
else:
|
| 270 | 270 |
same_branch = (refname == branch_parent)
|
| 271 | |
if not branch_parent:
|
| 272 | |
# avoid checking branch parent again later
|
|
271 |
if same_branch and not branch_parent:
|
|
272 |
# avoid expensive checking branch parent again later
|
| 273 | 273 |
fast_foward = False
|
| 274 | 274 |
else:
|
| 275 | 275 |
same_branch = False
|
|
0 |
[DEFAULT]
|
|
1 |
Depends: subversion, mercurial, git-core, bzr, python-yaml, python-dateutil
|
|
2 |
Depends3: subversion, mercurial, git-core, bzr, python3-yaml
|
|
3 |
Suite: oneiric precise quantal raring saucy trusty utopic vivid wheezy jessie
|
|
4 |
X-Python3-Version: >= 3.2
|
| 0 | |
[DEFAULT]
|
| 1 | |
Depends: subversion, mercurial, git-core, bzr, python-yaml, python-dateutil
|
| 2 | |
Suite: lucid oneiric precise quantal raring saucy trusty wheezy jessie
|
| 3 | |
XS-Python-Version: >= 2.6
|
| 0 | |
[DEFAULT]
|
| 1 | |
Package: python3-vcstools
|
| 2 | |
Depends: subversion, mercurial, git-core, bzr, python3-yaml
|
| 3 | |
Suite: precise quantal raring saucy trusty wheezy jessie
|
| 4 | |
X-Python3-Version: >= 3.3
|
| 304 | 304 |
self.assertTrue(client.update(new_branch))
|
| 305 | 305 |
self.assertEqual(client.get_branch(), new_branch)
|
| 306 | 306 |
self.assertEqual(client.get_branch_parent(), new_branch)
|
|
307 |
|
|
308 |
def test_checkout_local_only_branch_and_update(self):
|
|
309 |
# prevent regression on wstool#25: no rebase after switching branch
|
|
310 |
url = self.remote_path
|
|
311 |
branch = "master"
|
|
312 |
client = GitClient(self.local_path)
|
|
313 |
self.assertFalse(client.path_exists())
|
|
314 |
self.assertFalse(client.detect_presence())
|
|
315 |
self.assertTrue(client.checkout(url, branch))
|
|
316 |
self.assertTrue(client.path_exists())
|
|
317 |
self.assertTrue(client.detect_presence())
|
|
318 |
self.assertTrue(client.is_local_branch(branch))
|
|
319 |
|
|
320 |
subprocess.check_call("git reset --hard HEAD~1", shell=True, cwd=self.local_path)
|
|
321 |
subprocess.check_call("git checkout -b new_local_branch", shell=True, cwd=self.local_path)
|
|
322 |
|
|
323 |
self.assertTrue(client.update(branch)) # same branch arg
|
|
324 |
self.assertEqual(client.get_branch(), branch)
|
|
325 |
self.assertEqual(client.get_version(), self.readonly_version)
|
|
326 |
self.assertEqual(client.get_branch_parent(), branch)
|
|
327 |
|
| 307 | 328 |
|
| 308 | 329 |
def test_checkout_specific_tag_and_update(self):
|
| 309 | 330 |
url = self.remote_path
|