/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/blackbox/test_missing.py

  • Committer: Jelmer Vernooij
  • Date: 2018-05-06 11:48:54 UTC
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@jelmer.uk-20180506114854-h4qd9ojaqy8wxjsd
Move .mailmap to root.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_missing.py
138
138
        lines7 = run_missing_a(['--show-ids'])
139
139
        self.assertLength(11, lines7)
140
140
 
141
 
        lines8 = run_missing_a(['--verbose'])
 
141
        lines8 =  run_missing_a(['--verbose'])
142
142
        self.assertEqual("modified:", lines8[-2])
143
143
        self.assertEqual("  a", lines8[-1])
144
144
 
155
155
        self.assertEqualDiff('This branch has no new revisions.',
156
156
                             run_missing_a(['--mine-only'], retcode=0)[0])
157
157
        self.assertEqualDiff('Other branch has no new revisions.',
158
 
                             run_missing_a(['--theirs-only'], retcode=0)[0])
 
158
                              run_missing_a(['--theirs-only'], retcode=0)[0])
159
159
 
160
160
    def test_missing_filtered(self):
161
161
        # create a source branch
172
172
 
173
173
        # local
174
174
        out, err = self.run_bzr('missing ../b --my-revision 3',
175
 
                                retcode=1, working_dir='a')
 
175
                               retcode=1, working_dir='a')
176
176
        self.assertMessages(out, ('a3', 'b2', 'b3', 'b4', 'b5'), ('a2', 'a4'))
177
177
 
178
178
        out, err = self.run_bzr('missing ../b --my-revision 3..4',
179
 
                                retcode=1, working_dir='a')
 
179
                               retcode=1, working_dir='a')
180
180
        self.assertMessages(out, ('a3', 'a4'), ('a2', 'a5'))
181
181
 
182
 
        # remote
 
182
        #remote
183
183
        out, err = self.run_bzr('missing ../b -r 3',
184
 
                                retcode=1, working_dir='a')
 
184
                               retcode=1, working_dir='a')
185
185
        self.assertMessages(out, ('a2', 'a3', 'a4', 'a5', 'b3'), ('b2', 'b4'))
186
186
 
187
187
        out, err = self.run_bzr('missing ../b -r 3..4',
188
 
                                retcode=1, working_dir='a')
 
188
                               retcode=1, working_dir='a')
189
189
        self.assertMessages(out, ('b3', 'b4'), ('b2', 'b5'))
190
190
 
191
 
        # both
 
191
        #both
192
192
        out, err = self.run_bzr('missing ../b --my-revision 3..4 -r 3..4',
193
 
                                retcode=1, working_dir='a')
 
193
                               retcode=1, working_dir='a')
194
194
        self.assertMessages(out, ('a3', 'a4', 'b3', 'b4'),
195
 
                            ('a2', 'a5', 'b2', 'b5'))
 
195
            ('a2', 'a5', 'b2', 'b5'))
196
196
 
197
197
    def test_missing_check_last_location(self):
198
198
        # check that last location shown as filepath not file URL