[Pkg-bazaar-commits] ./bzr-pqm/unstable r63: * New upstream snapshot.

[Jelmer Vernooij]

------------------------------------------------------------
revno: 63
committer: Jelmer Vernooij <jelmer at debian.org>
branch nick: debian
timestamp: Sat 2009-03-21 15:00:33 +0100
message:
  * New upstream snapshot.
  * Bump standards version to 3.8.1.
  * Move to section vcs.
removed:
  .bzrignore
modified:
  __init__.py
  debian/changelog
  debian/control
  pqm_submit.py
    ------------------------------------------------------------
    revno: 51.3.1
    committer: James Henstridge <james at jamesh.id.au>
    branch nick: bzr-pqm.jamesh
    timestamp: Thu 2008-04-03 17:42:16 +0800
    message:
      increment version number, post release
    modified:
      __init__.py
    ------------------------------------------------------------
    revno: 51.3.2
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: pqm
    timestamp: Mon 2008-04-21 10:53:51 -0500
    message:
      Display the public location when we check it for accuracy.
    modified:
      pqm_submit.py
    ------------------------------------------------------------
    revno: 51.3.3
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: devel
    timestamp: Fri 2009-02-06 11:20:48 -0600
    message:
      A quick change to delay importing bzrdir until we actually use it.
    modified:
      __init__.py
    ------------------------------------------------------------
    revno: 51.1.7
    tags: upstream-1.3.0+bzr60
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: upstream
    timestamp: Sat 2009-03-21 14:59:21 +0100
    message:
      Import upstream version 1.3.0+bzr60
    removed:
      .bzrignore
    modified:
      __init__.py
      pqm_submit.py
-------------- next part --------------
=== removed file '.bzrignore'
--- a/.bzrignore	2006-10-19 09:47:13 +0000
+++ b/.bzrignore	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-*.py[co]
-./build
-./dist
-./MANIFEST

=== modified file '__init__.py'
--- a/__init__.py	2008-04-03 09:23:19 +0000
+++ b/__init__.py	2009-02-06 17:20:48 +0000
@@ -19,10 +19,8 @@
 from bzrlib.commands import Command, register_command
 from bzrlib.option import Option
 
-from bzrlib.bzrdir import BzrDir
-
-
-version_info = (1, 3, 0, 'final', 0)
+
+version_info = (1, 4, 0, 'dev', 0)
 
 if version_info[3] == 'final':
     version_string = '%d.%d.%d' % version_info[:3]
@@ -84,7 +82,7 @@
 
     def run(self, location=None, message=None, public_location=None,
             dry_run=False, submit_branch=None):
-        from bzrlib import errors, trace
+        from bzrlib import errors, trace, bzrdir
         if __name__ != 'bzrlib.plugins.pqm':
             trace.warning('The bzr-pqm plugin needs to be called'
                           ' "bzrlib.plugins.pqm" not "%s"\n'
@@ -95,7 +93,7 @@
 
         if location is None:
             location = '.'
-        tree, b, relpath = BzrDir.open_containing_tree_or_branch(location)
+        tree, b, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(location)
         if relpath and not tree and location != '.':
             raise errors.BzrCommandError(
                 'No working tree was found, but we were not given the '

=== modified file 'debian/changelog'
--- a/debian/changelog	2008-08-23 17:40:45 +0000
+++ b/debian/changelog	2009-03-21 14:00:33 +0000
@@ -1,3 +1,11 @@
+bzr-pqm (1.4.0~bzr60-1) unstable; urgency=low
+
+  * New upstream snapshot.
+  * Bump standards version to 3.8.1.
+  * Move to section vcs.
+
+ -- Jelmer Vernooij <jelmer at debian.org>  Sat, 21 Mar 2009 14:59:58 +0100
+
 bzr-pqm (1.3.0-1) unstable; urgency=low
 
   * New upstream release.

=== modified file 'debian/control'
--- a/debian/control	2008-08-23 17:40:45 +0000
+++ b/debian/control	2009-03-21 14:00:33 +0000
@@ -1,10 +1,10 @@
 Source: bzr-pqm
-Section: devel
+Section: vcs
 Priority: optional
 Maintainer: Debian Bazaar Maintainers <pkg-bazaar-maint at lists.alioth.debian.org>
-Uploaders: Etienne Goyer <etienne.goyer at ubuntu.com>, James Henstridge <james at jamesh.id.au>, Jelmer Vernooij <jelmer at samba.org>
+Uploaders: Etienne Goyer <etienne.goyer at ubuntu.com>, James Henstridge <james at jamesh.id.au>, Jelmer Vernooij <jelmer at debian.org>
 Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), python, python-central (>= 0.5), bzr (>=0.90)
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
 XS-Python-Version: >= 2.4
 DM-Upload-Allowed: yes
 Vcs-Bzr: http://bzr.debian.org/pkg-bazaar/bzr-pqm/unstable

=== modified file 'pqm_submit.py'
--- a/pqm_submit.py	2008-04-03 09:23:19 +0000
+++ b/pqm_submit.py	2008-04-21 15:53:51 +0000
@@ -149,7 +149,8 @@
 
     def check_public_branch(self):
         """Check that the public branch is up to date with the local copy."""
-        note('Checking that the public branch is up to date ...')
+        note('Checking that the public branch is up to date at\n    %s',
+             urlutils.unescape_for_display(self.public_location, 'utf-8'))
         local_revision = self.source_branch.last_revision()
         public_revision = Branch.open(self.public_location).last_revision()
         if local_revision != public_revision: