/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/foreign.py

• browse files at revision 5131.2.1
• compare with another revision
• download diff
• download tarball
• view history from revision 5131.2.1

• reverse the comparison (5131.2.1 to 5200.3.2)
• stop comparing with revision 5200.3.2

Show diffs side-by-side

added

removed

bzrlib/foreign.py

296

296

        except NoWorkingTree:

297

297

            source_branch = Branch.open(directory)

298

298

            source_wt = None

299

 

        if source_wt is not None:

300

 

            source_wt.check_changed_or_out_of_date(

301

 

                strict, 'dpush_strict',

302

 

                more_error='Use --no-strict to force the push.',

303

 

                more_warning='Uncommitted changes will not be pushed.')

 

299

        if strict is None:

 

300

            strict = source_branch.get_config(

 

301

                ).get_user_option_as_bool('dpush_strict')

 

302

        if strict is None: strict = True # default value

 

303

        if strict and source_wt is not None:

 

304

            if (source_wt.has_changes()):

 

305

                raise errors.UncommittedChanges(

 

306

                    source_wt, more='Use --no-strict to force the push.')

 

307

            if source_wt.last_revision() != source_wt.branch.last_revision():

 

308

                # The tree has lost sync with its branch, there is little

 

309

                # chance that the user is aware of it but he can still force

 

310

                # the push with --no-strict

 

311

                raise errors.OutOfDateTree(

 

312

                    source_wt, more='Use --no-strict to force the push.')

304

313

        stored_loc = source_branch.get_push_location()

305

314

        if location is None:

306

315

            if stored_loc is None:

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0