/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/transform.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2017-06-11 02:34:42 UTC
  • mfrom: (6681.2.10 more-controldir)
  • Revision ID: breezy.the.bot@gmail.com-20170611023442-p3vm7secrkqn6ckx
Some more bzrdir vs controldir fixes.

Merged from https://code.launchpad.net/~jelmer/brz/more-controldir/+merge/325453

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/transform.py
1430
1430
def move_orphan(tt, orphan_id, parent_id):
1431
1431
    """See TreeTransformBase.new_orphan.
1432
1432
 
1433
 
    This creates a new orphan in the `bzr-orphans` dir at the root of the
 
1433
    This creates a new orphan in the `brz-orphans` dir at the root of the
1434
1434
    `TreeTransform`.
1435
1435
 
1436
1436
    :param tt: The TreeTransform orphaning `trans_id`.
1440
1440
    :param parent_id: The orphan parent trans id.
1441
1441
    """
1442
1442
    # Add the orphan dir if it doesn't exist
1443
 
    orphan_dir_basename = 'bzr-orphans'
 
1443
    orphan_dir_basename = 'brz-orphans'
1444
1444
    od_id = tt.trans_id_tree_path(orphan_dir_basename)
1445
1445
    if tt.final_kind(od_id) is None:
1446
1446
        tt.create_directory(od_id)
1467
1467
    'Leave orphans in place and create a conflict on the directory.')
1468
1468
orphaning_registry.register(
1469
1469
    'move', move_orphan,
1470
 
    'Move orphans into the bzr-orphans directory.')
 
1470
    'Move orphans into the brz-orphans directory.')
1471
1471
orphaning_registry._set_default_key('conflict')
1472
1472
 
1473
1473