/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
453 by Martin Pool
- Split WorkingTree into its own file
1
# Copyright (C) 2005 Canonical Ltd
2
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
1185.16.72 by Martin Pool
[merge] from robert and fix up tests
17
"""WorkingTree object and friends.
18
19
A WorkingTree represents the editable working copy of a branch.
20
Operations which represent the WorkingTree are also done here, 
21
such as renaming or adding files.  The WorkingTree has an inventory 
22
which is updated by these operations.  A commit produces a 
23
new revision based on the workingtree and its inventory.
24
25
At the moment every WorkingTree has its own branch.  Remote
26
WorkingTrees aren't supported.
27
28
To get a WorkingTree, call Branch.working_tree():
29
"""
30
31
32
# TODO: Don't allow WorkingTrees to be constructed for remote branches if 
33
# they don't work.
453 by Martin Pool
- Split WorkingTree into its own file
34
956 by Martin Pool
doc
35
# FIXME: I don't know if writing out the cache from the destructor is really a
1185.16.72 by Martin Pool
[merge] from robert and fix up tests
36
# good idea, because destructors are considered poor taste in Python, and it's
37
# not predictable when it will be written out.
38
39
# TODO: Give the workingtree sole responsibility for the working inventory;
40
# remove the variable and references to it from the branch.  This may require
41
# updating the commit code so as to update the inventory within the working
42
# copy, and making sure there's only one WorkingTree for any directory on disk.
43
# At the momenthey may alias the inventory and have old copies of it in memory.
956 by Martin Pool
doc
44
453 by Martin Pool
- Split WorkingTree into its own file
45
import os
1398 by Robert Collins
integrate in Gustavos x-bit patch
46
import stat
1140 by Martin Pool
- lift out import statements within WorkingTree
47
import fnmatch
1457.1.1 by Robert Collins
rather than getting the branch inventory, WorkingTree can use the whole Branch, or make its own.
48
 
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
49
from bzrlib.branch import Branch, needs_read_lock, needs_write_lock, quotefn
453 by Martin Pool
- Split WorkingTree into its own file
50
import bzrlib.tree
1457.1.3 by Robert Collins
make Branch.relpath delegate to the working tree.
51
from bzrlib.osutils import appendpath, file_kind, isdir, splitpath, relpath
1185.12.60 by Aaron Bentley
Merge from mainline
52
from bzrlib.errors import BzrCheckError, DivergedBranches, NotVersionedError
1140 by Martin Pool
- lift out import statements within WorkingTree
53
from bzrlib.trace import mutter
453 by Martin Pool
- Split WorkingTree into its own file
54
1465 by Robert Collins
Bugfix the new pull --clobber to not generate spurious conflicts.
55
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
56
class TreeEntry(object):
57
    """An entry that implements the minium interface used by commands.
58
59
    This needs further inspection, it may be better to have 
60
    InventoryEntries without ids - though that seems wrong. For now,
61
    this is a parallel hierarchy to InventoryEntry, and needs to become
62
    one of several things: decorates to that hierarchy, children of, or
63
    parents of it.
1399.1.3 by Robert Collins
move change detection for text and metadata from delta to entry.detect_changes
64
    Another note is that these objects are currently only used when there is
65
    no InventoryEntry available - i.e. for unversioned objects.
66
    Perhaps they should be UnversionedEntry et al. ? - RBC 20051003
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
67
    """
68
 
69
    def __eq__(self, other):
70
        # yes, this us ugly, TODO: best practice __eq__ style.
71
        return (isinstance(other, TreeEntry)
72
                and other.__class__ == self.__class__)
73
 
74
    def kind_character(self):
75
        return "???"
76
77
78
class TreeDirectory(TreeEntry):
79
    """See TreeEntry. This is a directory in a working tree."""
80
81
    def __eq__(self, other):
82
        return (isinstance(other, TreeDirectory)
83
                and other.__class__ == self.__class__)
84
85
    def kind_character(self):
86
        return "/"
87
88
89
class TreeFile(TreeEntry):
90
    """See TreeEntry. This is a regular file in a working tree."""
91
92
    def __eq__(self, other):
93
        return (isinstance(other, TreeFile)
94
                and other.__class__ == self.__class__)
95
96
    def kind_character(self):
97
        return ''
98
99
100
class TreeLink(TreeEntry):
101
    """See TreeEntry. This is a symlink in a working tree."""
102
103
    def __eq__(self, other):
104
        return (isinstance(other, TreeLink)
105
                and other.__class__ == self.__class__)
106
107
    def kind_character(self):
108
        return ''
109
110
453 by Martin Pool
- Split WorkingTree into its own file
111
class WorkingTree(bzrlib.tree.Tree):
112
    """Working copy tree.
113
114
    The inventory is held in the `Branch` working-inventory, and the
115
    files are in a directory on disk.
116
117
    It is possible for a `WorkingTree` to have a filename which is
118
    not listed in the Inventory and vice versa.
119
    """
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
120
1457.1.1 by Robert Collins
rather than getting the branch inventory, WorkingTree can use the whole Branch, or make its own.
121
    def __init__(self, basedir, branch=None):
122
        """Construct a WorkingTree for basedir.
123
124
        If the branch is not supplied, it is opened automatically.
125
        If the branch is supplied, it must be the branch for this basedir.
126
        (branch.base is not cross checked, because for remote branches that
127
        would be meaningless).
128
        """
866 by Martin Pool
- use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created.
129
        from bzrlib.hashcache import HashCache
130
        from bzrlib.trace import note, mutter
1185.16.72 by Martin Pool
[merge] from robert and fix up tests
131
        assert isinstance(basedir, basestring), \
132
            "base directory %r is not a string" % basedir
1457.1.1 by Robert Collins
rather than getting the branch inventory, WorkingTree can use the whole Branch, or make its own.
133
        if branch is None:
134
            branch = Branch.open(basedir)
1185.16.72 by Martin Pool
[merge] from robert and fix up tests
135
        assert isinstance(branch, Branch), \
136
            "branch %r is not a Branch" % branch
1457.1.1 by Robert Collins
rather than getting the branch inventory, WorkingTree can use the whole Branch, or make its own.
137
        self._inventory = branch.inventory
138
        self.path2id = self._inventory.path2id
139
        self.branch = branch
453 by Martin Pool
- Split WorkingTree into its own file
140
        self.basedir = basedir
866 by Martin Pool
- use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created.
141
142
        # update the whole cache up front and write to disk if anything changed;
143
        # in the future we might want to do this more selectively
1467 by Robert Collins
WorkingTree.__del__ has been removed.
144
        # two possible ways offer themselves : in self._unlock, write the cache
145
        # if needed, or, when the cache sees a change, append it to the hash
146
        # cache file, and have the parser take the most recent entry for a
147
        # given path only.
866 by Martin Pool
- use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created.
148
        hc = self._hashcache = HashCache(basedir)
149
        hc.read()
954 by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly
150
        hc.scan()
866 by Martin Pool
- use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created.
151
152
        if hc.needs_write:
153
            mutter("write hc")
154
            hc.write()
453 by Martin Pool
- Split WorkingTree into its own file
155
462 by Martin Pool
- New form 'file_id in tree' to check if the file is present
156
    def __iter__(self):
157
        """Iterate through file_ids for this tree.
158
159
        file_ids are in a WorkingTree if they are in the working inventory
160
        and the working file exists.
161
        """
162
        inv = self._inventory
866 by Martin Pool
- use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created.
163
        for path, ie in inv.iter_entries():
1092.2.6 by Robert Collins
symlink support updated to work
164
            if bzrlib.osutils.lexists(self.abspath(path)):
866 by Martin Pool
- use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created.
165
                yield ie.file_id
462 by Martin Pool
- New form 'file_id in tree' to check if the file is present
166
167
453 by Martin Pool
- Split WorkingTree into its own file
168
    def __repr__(self):
169
        return "<%s of %s>" % (self.__class__.__name__,
954 by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly
170
                               getattr(self, 'basedir', None))
453 by Martin Pool
- Split WorkingTree into its own file
171
866 by Martin Pool
- use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created.
172
173
453 by Martin Pool
- Split WorkingTree into its own file
174
    def abspath(self, filename):
175
        return os.path.join(self.basedir, filename)
176
1457.1.3 by Robert Collins
make Branch.relpath delegate to the working tree.
177
    def relpath(self, abspath):
178
        """Return the local path portion from a given absolute path."""
179
        return relpath(self.basedir, abspath)
180
453 by Martin Pool
- Split WorkingTree into its own file
181
    def has_filename(self, filename):
1092.2.6 by Robert Collins
symlink support updated to work
182
        return bzrlib.osutils.lexists(self.abspath(filename))
453 by Martin Pool
- Split WorkingTree into its own file
183
184
    def get_file(self, file_id):
185
        return self.get_file_byname(self.id2path(file_id))
186
187
    def get_file_byname(self, filename):
188
        return file(self.abspath(filename), 'rb')
189
190
    def _get_store_filename(self, file_id):
191
        ## XXX: badly named; this isn't in the store at all
192
        return self.abspath(self.id2path(file_id))
193
1248 by Martin Pool
- new weave based cleanup [broken]
194
195
    def id2abspath(self, file_id):
196
        return self.abspath(self.id2path(file_id))
197
462 by Martin Pool
- New form 'file_id in tree' to check if the file is present
198
                
1185.12.39 by abentley
Propogated has_or_had_id to Tree
199
    def has_id(self, file_id):
453 by Martin Pool
- Split WorkingTree into its own file
200
        # files that have been deleted are excluded
1185.12.39 by abentley
Propogated has_or_had_id to Tree
201
        inv = self._inventory
866 by Martin Pool
- use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created.
202
        if not inv.has_id(file_id):
453 by Martin Pool
- Split WorkingTree into its own file
203
            return False
866 by Martin Pool
- use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created.
204
        path = inv.id2path(file_id)
1092.2.6 by Robert Collins
symlink support updated to work
205
        return bzrlib.osutils.lexists(self.abspath(path))
462 by Martin Pool
- New form 'file_id in tree' to check if the file is present
206
1185.12.39 by abentley
Propogated has_or_had_id to Tree
207
    def has_or_had_id(self, file_id):
208
        if file_id == self.inventory.root.file_id:
209
            return True
210
        return self.inventory.has_id(file_id)
462 by Martin Pool
- New form 'file_id in tree' to check if the file is present
211
212
    __contains__ = has_id
213
    
214
453 by Martin Pool
- Split WorkingTree into its own file
215
    def get_file_size(self, file_id):
1248 by Martin Pool
- new weave based cleanup [broken]
216
        return os.path.getsize(self.id2abspath(file_id))
453 by Martin Pool
- Split WorkingTree into its own file
217
218
    def get_file_sha1(self, file_id):
866 by Martin Pool
- use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created.
219
        path = self._inventory.id2path(file_id)
220
        return self._hashcache.get_sha1(path)
453 by Martin Pool
- Split WorkingTree into its own file
221
1398 by Robert Collins
integrate in Gustavos x-bit patch
222
223
    def is_executable(self, file_id):
224
        if os.name == "nt":
225
            return self._inventory[file_id].executable
226
        else:
227
            path = self._inventory.id2path(file_id)
228
            mode = os.lstat(self.abspath(path)).st_mode
229
            return bool(stat.S_ISREG(mode) and stat.S_IEXEC&mode)
230
1092.2.6 by Robert Collins
symlink support updated to work
231
    def get_symlink_target(self, file_id):
1185.15.10 by Scott James Remnant
Fix WorkingTree.get_symlink_target() to read the absolute path of the
232
        return os.readlink(self.id2abspath(file_id))
453 by Martin Pool
- Split WorkingTree into its own file
233
234
    def file_class(self, filename):
235
        if self.path2id(filename):
236
            return 'V'
237
        elif self.is_ignored(filename):
238
            return 'I'
239
        else:
240
            return '?'
241
242
243
    def list_files(self):
244
        """Recursively list all files as (path, class, kind, id).
245
246
        Lists, but does not descend into unversioned directories.
247
248
        This does not include files that have been deleted in this
249
        tree.
250
251
        Skips the control directory.
252
        """
866 by Martin Pool
- use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created.
253
        inv = self._inventory
453 by Martin Pool
- Split WorkingTree into its own file
254
255
        def descend(from_dir_relpath, from_dir_id, dp):
256
            ls = os.listdir(dp)
257
            ls.sort()
258
            for f in ls:
259
                ## TODO: If we find a subdirectory with its own .bzr
260
                ## directory, then that is a separate tree and we
261
                ## should exclude it.
262
                if bzrlib.BZRDIR == f:
263
                    continue
264
265
                # path within tree
266
                fp = appendpath(from_dir_relpath, f)
267
268
                # absolute path
269
                fap = appendpath(dp, f)
270
                
271
                f_ie = inv.get_child(from_dir_id, f)
272
                if f_ie:
273
                    c = 'V'
274
                elif self.is_ignored(fp):
275
                    c = 'I'
276
                else:
277
                    c = '?'
278
279
                fk = file_kind(fap)
280
281
                if f_ie:
282
                    if f_ie.kind != fk:
283
                        raise BzrCheckError("file %r entered as kind %r id %r, "
284
                                            "now of kind %r"
285
                                            % (fap, f_ie.kind, f_ie.file_id, fk))
286
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
287
                # make a last minute entry
288
                if f_ie:
289
                    entry = f_ie
290
                else:
291
                    if fk == 'directory':
292
                        entry = TreeDirectory()
293
                    elif fk == 'file':
294
                        entry = TreeFile()
295
                    elif fk == 'symlink':
296
                        entry = TreeLink()
297
                    else:
298
                        entry = TreeEntry()
299
                
300
                yield fp, c, fk, (f_ie and f_ie.file_id), entry
453 by Martin Pool
- Split WorkingTree into its own file
301
302
                if fk != 'directory':
303
                    continue
304
305
                if c != 'V':
306
                    # don't descend unversioned directories
307
                    continue
308
                
309
                for ff in descend(fp, f_ie.file_id, fap):
310
                    yield ff
311
312
        for f in descend('', inv.root.file_id, self.basedir):
313
            yield f
314
            
315
316
317
    def unknowns(self):
318
        for subp in self.extras():
319
            if not self.is_ignored(subp):
320
                yield subp
321
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
322
    def iter_conflicts(self):
323
        conflicted = set()
324
        for path in (s[0] for s in self.list_files()):
325
            stem = get_conflicted_stem(path)
326
            if stem is None:
327
                continue
328
            if stem not in conflicted:
329
                conflicted.add(stem)
330
                yield stem
453 by Martin Pool
- Split WorkingTree into its own file
331
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
332
    @needs_write_lock
1185.12.92 by Aaron Bentley
Fixed pull help, renamed clobber to overwrite
333
    def pull(self, source, remember=False, overwrite=False):
1465 by Robert Collins
Bugfix the new pull --clobber to not generate spurious conflicts.
334
        from bzrlib.merge import merge_inner
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
335
        source.lock_read()
336
        try:
337
            old_revision_history = self.branch.revision_history()
338
            try:
339
                self.branch.update_revisions(source)
340
            except DivergedBranches:
1185.12.92 by Aaron Bentley
Fixed pull help, renamed clobber to overwrite
341
                if not overwrite:
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
342
                    raise
1442.1.68 by Robert Collins
'bzr pull' now accepts '--clobber'.
343
                self.branch.set_revision_history(source.revision_history())
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
344
            new_revision_history = self.branch.revision_history()
345
            if new_revision_history != old_revision_history:
1465 by Robert Collins
Bugfix the new pull --clobber to not generate spurious conflicts.
346
                if len(old_revision_history):
347
                    other_revision = old_revision_history[-1]
348
                else:
349
                    other_revision = None
350
                merge_inner(self.branch,
351
                            self.branch.basis_tree(), 
352
                            self.branch.revision_tree(other_revision))
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
353
            if self.branch.get_parent() is None or remember:
354
                self.branch.set_parent(source.base)
355
        finally:
356
            source.unlock()
357
453 by Martin Pool
- Split WorkingTree into its own file
358
    def extras(self):
359
        """Yield all unknown files in this WorkingTree.
360
361
        If there are any unknown directories then only the directory is
362
        returned, not all its children.  But if there are unknown files
363
        under a versioned subdirectory, they are returned.
364
365
        Currently returned depth-first, sorted by name within directories.
366
        """
367
        ## TODO: Work from given directory downwards
368
        for path, dir_entry in self.inventory.directories():
369
            mutter("search for unknowns in %r" % path)
370
            dirabs = self.abspath(path)
371
            if not isdir(dirabs):
372
                # e.g. directory deleted
373
                continue
374
375
            fl = []
376
            for subf in os.listdir(dirabs):
377
                if (subf != '.bzr'
378
                    and (subf not in dir_entry.children)):
379
                    fl.append(subf)
380
            
381
            fl.sort()
382
            for subf in fl:
383
                subp = appendpath(path, subf)
384
                yield subp
385
386
387
    def ignored_files(self):
388
        """Yield list of PATH, IGNORE_PATTERN"""
389
        for subp in self.extras():
390
            pat = self.is_ignored(subp)
391
            if pat != None:
392
                yield subp, pat
393
394
395
    def get_ignore_list(self):
396
        """Return list of ignore patterns.
397
398
        Cached in the Tree object after the first call.
399
        """
400
        if hasattr(self, '_ignorelist'):
401
            return self._ignorelist
402
403
        l = bzrlib.DEFAULT_IGNORE[:]
404
        if self.has_filename(bzrlib.IGNORE_FILENAME):
405
            f = self.get_file_byname(bzrlib.IGNORE_FILENAME)
406
            l.extend([line.rstrip("\n\r") for line in f.readlines()])
407
        self._ignorelist = l
408
        return l
409
410
411
    def is_ignored(self, filename):
412
        r"""Check whether the filename matches an ignore pattern.
413
414
        Patterns containing '/' or '\' need to match the whole path;
415
        others match against only the last component.
416
417
        If the file is ignored, returns the pattern which caused it to
418
        be ignored, otherwise None.  So this can simply be used as a
419
        boolean if desired."""
420
421
        # TODO: Use '**' to match directories, and other extended
422
        # globbing stuff from cvs/rsync.
423
424
        # XXX: fnmatch is actually not quite what we want: it's only
425
        # approximately the same as real Unix fnmatch, and doesn't
426
        # treat dotfiles correctly and allows * to match /.
427
        # Eventually it should be replaced with something more
428
        # accurate.
429
        
430
        for pat in self.get_ignore_list():
431
            if '/' in pat or '\\' in pat:
432
                
433
                # as a special case, you can put ./ at the start of a
434
                # pattern; this is good to match in the top-level
435
                # only;
436
                
437
                if (pat[:2] == './') or (pat[:2] == '.\\'):
438
                    newpat = pat[2:]
439
                else:
440
                    newpat = pat
441
                if fnmatch.fnmatchcase(filename, newpat):
442
                    return pat
443
            else:
444
                if fnmatch.fnmatchcase(splitpath(filename)[-1], pat):
445
                    return pat
446
        else:
447
            return None
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
448
1185.12.28 by Aaron Bentley
Removed use of readonly path for executability test
449
    def kind(self, file_id):
450
        return file_kind(self.id2abspath(file_id))
451
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
452
    def lock_read(self):
453
        """See Branch.lock_read, and WorkingTree.unlock."""
454
        return self.branch.lock_read()
455
456
    def lock_write(self):
457
        """See Branch.lock_write, and WorkingTree.unlock."""
458
        return self.branch.lock_write()
459
460
    @needs_write_lock
461
    def remove(self, files, verbose=False):
462
        """Remove nominated files from the working inventory..
463
464
        This does not remove their text.  This does not run on XXX on what? RBC
465
466
        TODO: Refuse to remove modified files unless --force is given?
467
468
        TODO: Do something useful with directories.
469
470
        TODO: Should this remove the text or not?  Tough call; not
471
        removing may be useful and the user can just use use rm, and
472
        is the opposite of add.  Removing it is consistent with most
473
        other tools.  Maybe an option.
474
        """
475
        ## TODO: Normalize names
476
        ## TODO: Remove nested loops; better scalability
477
        if isinstance(files, basestring):
478
            files = [files]
479
480
        inv = self.inventory
481
482
        # do this before any modifications
483
        for f in files:
484
            fid = inv.path2id(f)
485
            if not fid:
1185.16.72 by Martin Pool
[merge] from robert and fix up tests
486
                # TODO: Perhaps make this just a warning, and continue?
487
                # This tends to happen when 
488
                raise NotVersionedError(path=f)
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
489
            mutter("remove inventory entry %s {%s}" % (quotefn(f), fid))
490
            if verbose:
491
                # having remove it, it must be either ignored or unknown
492
                if self.is_ignored(f):
493
                    new_status = 'I'
494
                else:
495
                    new_status = '?'
496
                show_status(new_status, inv[fid].kind, quotefn(f))
497
            del inv[fid]
498
499
        self.branch._write_inventory(inv)
500
501
    def unlock(self):
502
        """See Branch.unlock.
503
        
504
        WorkingTree locking just uses the Branch locking facilities.
505
        This is current because all working trees have an embedded branch
506
        within them. IF in the future, we were to make branch data shareable
507
        between multiple working trees, i.e. via shared storage, then we 
508
        would probably want to lock both the local tree, and the branch.
509
        """
510
        return self.branch.unlock()
511
512
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
513
CONFLICT_SUFFIXES = ('.THIS', '.BASE', '.OTHER')
514
def get_conflicted_stem(path):
515
    for suffix in CONFLICT_SUFFIXES:
516
        if path.endswith(suffix):
517
            return path[:-len(suffix)]