1
=== modified file 'NEWS'
2
--- NEWS	2009-12-10 21:49:20 +0000
3
+++ NEWS	2009-12-11 05:52:13 +0000
4
@@ -26,6 +26,9 @@
5
26
* ``bzr commit`` now has a ``--commit-time`` option.
26
* ``bzr commit`` now has a ``--commit-time`` option.
6
27
  (Alexander Sack, #459276)
27
  (Alexander Sack, #459276)
7
28
28
8
29
* New option ``bzr unshelve --keep`` applies the changes and leaves them
9
30
  on the shelf.  (Martin Pool, Oscar Fuentes, #492091)
10
31
11
29
* The ``BZR_COLUMNS`` envrionment variable can be set to force bzr to
32
* The ``BZR_COLUMNS`` envrionment variable can be set to force bzr to
12
30
  respect a given terminal width. This can be useful when output is
33
  respect a given terminal width. This can be useful when output is
13
31
  redirected or in obscure cases where the default value is not
34
  redirected or in obscure cases where the default value is not
14
32
35
15
=== modified file 'bzrlib/builtins.py'
16
--- bzrlib/builtins.py	2009-12-09 08:38:02 +0000
17
+++ bzrlib/builtins.py	2009-12-11 05:52:13 +0000
18
@@ -5793,7 +5793,8 @@
19
5793
            enum_switch=False, value_switches=True,
5793
            enum_switch=False, value_switches=True,
20
5794
            apply="Apply changes and remove from the shelf.",
5794
            apply="Apply changes and remove from the shelf.",
21
5795
            dry_run="Show changes, but do not apply or remove them.",
5795
            dry_run="Show changes, but do not apply or remove them.",
23
5796
            delete_only="Delete changes without applying them."
5796
            delete_only="Delete changes without applying them.",
24
5797
            keep="Apply changes but don't delete them.",
25
5797
        )
5798
        )
26
5798
    ]
5799
    ]
27
5799
    _see_also = ['shelve']
5800
    _see_also = ['shelve']
28
5800
5801
29
=== modified file 'bzrlib/shelf_ui.py'
30
--- bzrlib/shelf_ui.py	2009-11-26 17:06:32 +0000
31
+++ bzrlib/shelf_ui.py	2009-12-11 05:52:13 +0000
32
@@ -414,9 +414,12 @@
33
414
            if action == 'dry-run':
414
            if action == 'dry-run':
34
415
                apply_changes = False
415
                apply_changes = False
35
416
                delete_shelf = False
416
                delete_shelf = False
37
417
            if action == 'delete-only':
417
            elif action == 'delete-only':
38
418
                apply_changes = False
418
                apply_changes = False
39
419
                read_shelf = False
419
                read_shelf = False
40
420
            elif action == 'keep':
41
421
                apply_changes = True
42
422
                delete_shelf = False
43
420
        except:
423
        except:
44
421
            tree.unlock()
424
            tree.unlock()
45
422
            raise
425
            raise
46
423
426
47
=== modified file 'bzrlib/tests/blackbox/test_shelve.py'
48
--- bzrlib/tests/blackbox/test_shelve.py	2009-03-23 14:59:43 +0000
49
+++ bzrlib/tests/blackbox/test_shelve.py	2009-12-11 05:52:13 +0000
50
@@ -1,4 +1,4 @@
52
1
# Copyright (C) 2008 Canonical Ltd
1
# Copyright (C) 2008, 2009 Canonical Ltd
53
2
#
2
#
54
3
# This program is free software; you can redistribute it and/or modify
3
# This program is free software; you can redistribute it and/or modify
55
4
# it under the terms of the GNU General Public License as published by
4
# it under the terms of the GNU General Public License as published by
56
@@ -18,6 +18,8 @@
57
18
18
58
19
from bzrlib import shelf
19
from bzrlib import shelf
59
20
from bzrlib.tests import TestCaseWithTransport
20
from bzrlib.tests import TestCaseWithTransport
60
21
from bzrlib.tests.script import ScriptRunner
61
22
62
21
23
63
22
class TestShelveList(TestCaseWithTransport):
24
class TestShelveList(TestCaseWithTransport):
64
23
25
65
@@ -65,6 +67,27 @@
66
65
        self.failIfExists('file')
67
        self.failIfExists('file')
67
66
        self.assertIs(None, tree.get_shelf_manager().last_shelf())
68
        self.assertIs(None, tree.get_shelf_manager().last_shelf())
68
67
69
69
70
    def test_unshelve_keep(self):
70
71
        # https://bugs.edge.launchpad.net/bzr/+bug/492091
71
72
        tree = self.make_branch_and_tree('.')
72
73
        # shelve apparently unhappy working with a tree with no root yet
73
74
        tree.commit('make root')
74
75
        self.build_tree(['file'])
75
76
76
77
        sr = ScriptRunner()
77
78
        sr.run_script(self, '''
78
79
$ bzr add file
79
80
$ bzr shelve --all -m Foo
80
81
$ bzr shelve --list
81
82
  1: Foo
82
83
$ bzr unshelve --keep
83
84
$ bzr shelve --list
84
85
  1: Foo
85
86
$ cat file
86
87
contents of file
87
88
''')
88
89
89
90
90
68
91
91
69
class TestShelveRelpath(TestCaseWithTransport):
92
class TestShelveRelpath(TestCaseWithTransport):
92
70
93
93
71
94
94
=== modified file 'bzrlib/tests/script.py'
95
--- bzrlib/tests/script.py	2009-11-08 20:28:36 +0000
96
+++ bzrlib/tests/script.py	2009-12-11 05:52:13 +0000
97
@@ -107,9 +107,11 @@
98
107
                error = []
107
                error = []
99
108
            error.append(line[2:] + '\n')
108
            error.append(line[2:] + '\n')
100
109
        else:
109
        else:
101
110
            # can happen if the first line is not recognized as a command, eg
102
111
            # if the prompt has leading whitespace
103
110
            if output is None:
112
            if output is None:
104
111
                if cmd_cur is None:
113
                if cmd_cur is None:
106
112
                    raise SyntaxError('No command for that output',
114
                    raise SyntaxError('No command for line %r' % (line,),
107
113
                                      (file_name, lineno, 1, orig))
115
                                      (file_name, lineno, 1, orig))
108
114
                output = []
116
                output = []
109
115
            output.append(line + '\n')
117
            output.append(line + '\n')
Reviewer	Review Type	Date Requested	Status
John A Meinel		2009-12-11	Approve on 2009-12-11
Review via email: mp+16001@code.launchpad.net