[ros-vcstools] 21/31: Imported Upstream version 0.1.36

[Jochen Sprickerhof]

This is an automated email from the git hooks/post-receive script.

jspricke-guest pushed a commit to branch master
in repository ros-vcstools.

commit acdfc189dace12c0880fbf7ec8ac91932336349d
Author: Leopold Palomo-Avellaneda <leopold.palomo at upc.edu>
Date:   Tue Jan 27 09:33:48 2015 +0100

    Imported Upstream version 0.1.36
---
 .travis.yml                 |  3 ++-
 doc/changelog.rst           |  6 ++++++
 src/vcstools/__version__.py |  2 +-
 src/vcstools/git.py         |  4 ++--
 stdeb.cfg                   |  5 +++++
 stdeb2.cfg                  |  4 ----
 stdeb3.cfg                  |  5 -----
 test/test_git.py            | 21 +++++++++++++++++++++
 8 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e57c3ea..5d6e3c9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,7 @@ env:
   # precise
   - HG='2.0.2' BZR=2.5.0 GIT=v1.7.9.5 SVN=1.6.17 PYYAML=3.10
   # quantal
-  - HG='2.2.2' BZR=2.6.0~beta2 GIT=v1.7.10.4 SVN=1.7.5 PYYAML=3.10
+  - HG='2.2.2' BZR=2.6.0+bzr6595 GIT=v1.7.10.4 SVN=1.7.5 PYYAML=3.10
 # bzr 2.1.1 only builds with python 2.6
 matrix:
   exclude:
@@ -28,6 +28,7 @@ matrix:
 before_install:
  - export REPO=`pwd`
 install:
+  - sudo apt-get update
   - sudo apt-get install -qq python3-yaml python3-dev
   - sudo apt-get install -qq libapr1 libapr1-dev libaprutil1 libaprutil1-dev libneon27 libneon27-dev libc6-dev g++ gcc
   - echo $PYTHONPATH
diff --git a/doc/changelog.rst b/doc/changelog.rst
index 13e2f15..d58a2d2 100644
--- a/doc/changelog.rst
+++ b/doc/changelog.rst
@@ -4,6 +4,12 @@ Changelog
 0.1
 ===
 
+0.1.36
+------
+
+- Updates to the release platforms (-lucid +utopic +vivid)
+- Fix an issue with updating branches on git, see vcstools/wstool#25
+
 0.1.31
 ------
 
diff --git a/src/vcstools/__version__.py b/src/vcstools/__version__.py
index 471553d..13bb794 100644
--- a/src/vcstools/__version__.py
+++ b/src/vcstools/__version__.py
@@ -1 +1 @@
-version = '0.1.35'
+version = '0.1.36'
diff --git a/src/vcstools/git.py b/src/vcstools/git.py
index f507c50..fc7c816 100644
--- a/src/vcstools/git.py
+++ b/src/vcstools/git.py
@@ -269,8 +269,8 @@ class GitClient(VcsClientBase):
                     same_branch = True
                 else:
                     same_branch = (refname == branch_parent)
-                if not branch_parent:
-                    # avoid checking branch parent again later
+                if same_branch and not branch_parent:
+                    # avoid expensive checking branch parent again later
                     fast_foward = False
         else:
             same_branch = False
diff --git a/stdeb.cfg b/stdeb.cfg
new file mode 100644
index 0000000..a166317
--- /dev/null
+++ b/stdeb.cfg
@@ -0,0 +1,5 @@
+[DEFAULT]
+Depends: subversion, mercurial, git-core, bzr, python-yaml, python-dateutil
+Depends3: subversion, mercurial, git-core, bzr, python3-yaml
+Suite: oneiric precise quantal raring saucy trusty utopic vivid wheezy jessie
+X-Python3-Version: >= 3.2
diff --git a/stdeb2.cfg b/stdeb2.cfg
deleted file mode 100644
index 1165f2c..0000000
--- a/stdeb2.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-[DEFAULT]
-Depends: subversion, mercurial, git-core, bzr, python-yaml, python-dateutil
-Suite: lucid oneiric precise quantal raring saucy trusty wheezy jessie
-XS-Python-Version: >= 2.6
diff --git a/stdeb3.cfg b/stdeb3.cfg
deleted file mode 100644
index 1c135d2..0000000
--- a/stdeb3.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-[DEFAULT]
-Package: python3-vcstools
-Depends: subversion, mercurial, git-core, bzr, python3-yaml
-Suite: precise quantal raring saucy trusty wheezy jessie
-X-Python3-Version: >= 3.3
diff --git a/test/test_git.py b/test/test_git.py
index 625a391..b250f8f 100644
--- a/test/test_git.py
+++ b/test/test_git.py
@@ -306,6 +306,27 @@ class GitClientTest(GitClientTestSetups):
         self.assertEqual(client.get_branch(), new_branch)
         self.assertEqual(client.get_branch_parent(), new_branch)
 
+    def test_checkout_local_only_branch_and_update(self):
+        # prevent regression on wstool#25: no rebase after switching branch
+        url = self.remote_path
+        branch = "master"
+        client = GitClient(self.local_path)
+        self.assertFalse(client.path_exists())
+        self.assertFalse(client.detect_presence())
+        self.assertTrue(client.checkout(url, branch))
+        self.assertTrue(client.path_exists())
+        self.assertTrue(client.detect_presence())
+        self.assertTrue(client.is_local_branch(branch))
+
+        subprocess.check_call("git reset --hard HEAD~1", shell=True, cwd=self.local_path)
+        subprocess.check_call("git checkout -b new_local_branch", shell=True, cwd=self.local_path)
+
+        self.assertTrue(client.update(branch))  # same branch arg
+        self.assertEqual(client.get_branch(), branch)
+        self.assertEqual(client.get_version(), self.readonly_version)
+        self.assertEqual(client.get_branch_parent(), branch)
+
+
     def test_checkout_specific_tag_and_update(self):
         url = self.remote_path
         tag = "last_tag"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-vcstools.git