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

  • Committer: Jelmer Vernooij
  • Date: 2018-03-25 18:22:28 UTC
  • mto: (0.200.1895 work)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@jelmer.uk-20180325182228-dafjeclx57ooxf42
Pass along target_missing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
workingtree.py
1204
1204
                extra_trees=None, require_versioned=False, include_root=False,
1205
1205
                want_unversioned=False):
1206
1206
        with self.lock_read():
1207
 
            changes = self._iter_git_changes(
 
1207
            changes, target_missing = self._iter_git_changes(
1208
1208
                    want_unchanged=want_unchanged,
1209
1209
                    specific_files=specific_files,
1210
1210
                    require_versioned=require_versioned,
1227
1227
                     pb=None, extra_trees=[], require_versioned=True,
1228
1228
                     want_unversioned=False):
1229
1229
        with self.lock_read():
1230
 
            changes = self._iter_git_changes(
 
1230
            changes, target_missing = self._iter_git_changes(
1231
1231
                    want_unchanged=include_unchanged,
1232
1232
                    specific_files=specific_files,
1233
1233
                    require_versioned=require_versioned,
1239
1239
            return changes_from_git_changes(
1240
1240
                    changes, self.target.mapping,
1241
1241
                    specific_files=specific_files,
1242
 
                    include_unchanged=include_unchanged)
 
1242
                    include_unchanged=include_unchanged,
 
1243
                    target_missing=target_missing)
1243
1244
 
1244
1245
 
1245
1246
tree.InterTree.register_optimiser(InterIndexGitTree)
1250
1251
        ap = tree.abspath(e)
1251
1252
        st = os.lstat(ap)
1252
1253
        try:
1253
 
            np, accessible  = osutils.normalized_filename(e)
 
1254
            np, accessible = osutils.normalized_filename(e)
1254
1255
        except UnicodeDecodeError:
1255
1256
            raise errors.BadFilenameEncoding(
1256
1257
                e, osutils._fs_enc)
1266
1267
    """Determine the changes between a git tree and a working tree with index.
1267
1268
 
1268
1269
    """
1269
 
    missing = []
 
1270
    missing = set()
1270
1271
    blobs = []
1271
1272
    for entry in iter_fresh_objects(target.index,
1272
1273
            target.abspath('.').encode(sys.getfilesystemencoding()),
1273
1274
            include_deleted=True):
1274
1275
        if entry[1] is None:
1275
 
            missing.append(entry[0])
 
1276
            missing.add(entry[0])
1276
1277
        else:
1277
1278
            blobs.append(entry)
1278
1279
    for p in missing:
1279
1280
        del target.index[p]
1280
1281
    to_tree_sha = commit_tree(store, blobs)
1281
 
    return store.tree_changes(from_tree_sha, to_tree_sha, include_trees=True,
1282
 
            want_unchanged=want_unchanged, change_type_same=True)
 
1282
    return (store.tree_changes(
 
1283
        from_tree_sha, to_tree_sha, include_trees=True,
 
1284
        want_unchanged=want_unchanged, change_type_same=True),
 
1285
        missing)