Rev 4598: Merge bzr.dev. in http://bazaar.launchpad.net/~lifeless/bzr/bug-375013
Robert Collins
robertc at robertcollins.net
Tue Aug 11 06:24:08 BST 2009
At http://bazaar.launchpad.net/~lifeless/bzr/bug-375013
------------------------------------------------------------
revno: 4598 [merge]
revision-id: robertc at robertcollins.net-20090811052401-mhyzhh0sfrtpwxvy
parent: robertc at robertcollins.net-20090811024536-hlpc7pf5vh3kxd1b
parent: pqm at pqm.ubuntu.com-20090811040617-g99p5v2wsn13ww8z
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bug-375013
timestamp: Tue 2009-08-11 15:24:01 +1000
message:
Merge bzr.dev.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
=== modified file 'NEWS'
--- a/NEWS 2009-08-06 06:58:09 +0000
+++ b/NEWS 2009-08-11 02:58:23 +0000
@@ -6,7 +6,6 @@
.. contents:: List of Releases
:depth: 1
-
In Development
##############
@@ -16,6 +15,49 @@
New Features
************
+Bug Fixes
+*********
+
+* Further tweaks to handling of ``bzr add`` messages about ignored files.
+ (Jason Spashett, #76616)
+
+Improvements
+************
+
+Documentation
+*************
+
+API Changes
+***********
+
+Internals
+*********
+
+Testing
+*******
+
+
+bzr 1.18
+########
+
+:Codename: little traveller
+:1.18rc1: 2009-08-10
+
+This release of Bazaar marches on towards the 2.0 release in which the 2a
+'brisbane-core' format becomes generally recommended. Most of the work in
+this release now focusses on bug fixes and stabilization, covering both 2a
+and previous formats. There is a new text-mode interactive merge feature,
+a new guide to migration to 2a format in the user documentation, and
+pushing branches to a smart server is now much faster.
+
+The Bazaar team decided that 2.0 will be a long-term supported release,
+with bugfix-only releases based on it continuing for at least six months
+or until the following stable release.
+
+
+New Features
+************
+
* ``bzr merge --interactive`` applies a user-selected portion of the
merge. The UI is similar to ``shelve``. (Aaron Bentley)
@@ -939,7 +981,7 @@
(Vincent Ladeuil, Robert Collins)
bzr 1.14
-###########
+########
:Codename: brisbane-core
:1.14rc1: 2009-04-06
:1.14rc2: 2009-04-19
=== modified file 'bzr'
--- a/bzr 2009-07-30 23:54:26 +0000
+++ b/bzr 2009-08-11 03:02:56 +0000
@@ -23,7 +23,7 @@
import warnings
# update this on each release
-_script_version = (1, 18, 0)
+_script_version = (2, 0, 0)
if __doc__ is None:
print "bzr does not support python -OO."
=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py 2009-07-20 11:27:05 +0000
+++ b/bzrlib/__init__.py 2009-08-11 03:02:56 +0000
@@ -50,7 +50,7 @@
# Python version 2.0 is (2, 0, 0, 'final', 0)." Additionally we use a
# releaselevel of 'dev' for unreleased under-development code.
-version_info = (1, 18, 0, 'dev', 0)
+version_info = (2, 0, 0, 'dev', 0)
# API compatibility version: bzrlib is currently API compatible with 1.15.
api_minimum_version = (1, 17, 0)
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py 2009-07-27 06:22:57 +0000
+++ b/bzrlib/builtins.py 2009-08-10 08:25:53 +0000
@@ -603,6 +603,9 @@
branches that will be merged later (without showing the two different
adds as a conflict). It is also useful when merging another project
into a subdirectory of this one.
+
+ Any files matching patterns in the ignore list will not be added
+ unless they are explicitly mentioned.
"""
takes_args = ['file*']
takes_options = [
@@ -616,7 +619,7 @@
help='Lookup file ids from this tree.'),
]
encoding_type = 'replace'
- _see_also = ['remove']
+ _see_also = ['remove', 'ignore']
def run(self, file_list, no_recurse=False, dry_run=False, verbose=False,
file_ids_from=None):
@@ -654,14 +657,6 @@
for path in ignored[glob]:
self.outf.write("ignored %s matching \"%s\"\n"
% (path, glob))
- else:
- match_len = 0
- for glob, paths in ignored.items():
- match_len += len(paths)
- self.outf.write("ignored %d file(s).\n" % match_len)
- self.outf.write("If you wish to add ignored files, "
- "please add them explicitly by name. "
- "(\"bzr ignored\" gives a list)\n")
class cmd_mkdir(Command):
=== modified file 'bzrlib/tests/blackbox/test_add.py'
--- a/bzrlib/tests/blackbox/test_add.py 2009-06-10 03:56:49 +0000
+++ b/bzrlib/tests/blackbox/test_add.py 2009-08-10 08:25:05 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006, 2007 Canonical Ltd
+# Copyright (C) 2005, 2006, 2007, 2009 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -55,20 +55,14 @@
out = self.run_bzr('add')[0]
# the ordering is not defined at the moment
results = sorted(out.rstrip('\n').split('\n'))
- self.assertEquals(['If you wish to add ignored files, '
- 'please add them explicitly by name. '
- '("bzr ignored" gives a list)',
- 'adding .bzrignore',
+ self.assertEquals(['adding .bzrignore',
'adding dir',
'adding dir/sub.txt',
- 'adding top.txt',
- 'ignored 1 file(s).'],
+ 'adding top.txt'],
results)
out = self.run_bzr('add -v')[0]
results = sorted(out.rstrip('\n').split('\n'))
- self.assertEquals(['If you wish to add ignored files, '\
- 'please add them explicitly by name. ("bzr ignored" gives a list)',
- 'ignored CVS matching "CVS"'],
+ self.assertEquals(['ignored CVS matching "CVS"'],
results)
def test_add_quiet_is(self):
More information about the bazaar-commits
mailing list