bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
| 
70
by mbp at sourcefrog
 Prepare for smart recursive add.  | 
1  | 
# Copyright (C) 2005 Canonical Ltd
 | 
2  | 
||
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
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  | 
||
17  | 
||
| 
800
by Martin Pool
 Merge John's import-speedup branch:  | 
18  | 
import sys, os  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
19  | 
|
20  | 
import bzrlib  | 
|
| 
800
by Martin Pool
 Merge John's import-speedup branch:  | 
21  | 
from bzrlib.trace import mutter, note  | 
22  | 
from bzrlib.osutils import isdir, quotefn, compact_date, rand_bytes, splitpath, \  | 
|
23  | 
sha_file, appendpath, file_kind  | 
|
24  | 
from bzrlib.errors import BzrError  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
25  | 
|
26  | 
BZR_BRANCH_FORMAT = "Bazaar-NG branch, format 0.0.4\n"  | 
|
27  | 
## TODO: Maybe include checks for common corruption of newlines, etc?
 | 
|
28  | 
||
29  | 
||
30  | 
||
| 
416
by Martin Pool
 - bzr log and bzr root now accept an http URL  | 
31  | 
def find_branch(f, **args):  | 
| 
455
by Martin Pool
 - fix 'bzr root'  | 
32  | 
if f and (f.startswith('http://') or f.startswith('https://')):  | 
| 
416
by Martin Pool
 - bzr log and bzr root now accept an http URL  | 
33  | 
import remotebranch  | 
34  | 
return remotebranch.RemoteBranch(f, **args)  | 
|
35  | 
else:  | 
|
36  | 
return Branch(f, **args)  | 
|
| 
580
by Martin Pool
 - Use explicit lock methods on a branch, rather than doing it  | 
37  | 
|
38  | 
||
| 
790
by Martin Pool
 Merge from aaron:  | 
39  | 
def find_cached_branch(f, cache_root, **args):  | 
40  | 
from remotebranch import RemoteBranch  | 
|
41  | 
br = find_branch(f, **args)  | 
|
42  | 
def cacheify(br, store_name):  | 
|
43  | 
from meta_store import CachedStore  | 
|
44  | 
cache_path = os.path.join(cache_root, store_name)  | 
|
45  | 
os.mkdir(cache_path)  | 
|
46  | 
new_store = CachedStore(getattr(br, store_name), cache_path)  | 
|
47  | 
setattr(br, store_name, new_store)  | 
|
48  | 
||
49  | 
if isinstance(br, RemoteBranch):  | 
|
50  | 
cacheify(br, 'inventory_store')  | 
|
51  | 
cacheify(br, 'text_store')  | 
|
52  | 
cacheify(br, 'revision_store')  | 
|
53  | 
return br  | 
|
54  | 
||
| 
580
by Martin Pool
 - Use explicit lock methods on a branch, rather than doing it  | 
55  | 
|
| 
600
by Martin Pool
 - Better Branch.relpath that doesn't match on  | 
56  | 
def _relpath(base, path):  | 
57  | 
"""Return path relative to base, or raise exception.  | 
|
58  | 
||
59  | 
    The path may be either an absolute path or a path relative to the
 | 
|
60  | 
    current working directory.
 | 
|
61  | 
||
62  | 
    Lifted out of Branch.relpath for ease of testing.
 | 
|
63  | 
||
64  | 
    os.path.commonprefix (python2.4) has a bad bug that it works just
 | 
|
65  | 
    on string prefixes, assuming that '/u' is a prefix of '/u2'.  This
 | 
|
66  | 
    avoids that problem."""
 | 
|
67  | 
rp = os.path.abspath(path)  | 
|
68  | 
||
69  | 
s = []  | 
|
70  | 
head = rp  | 
|
71  | 
while len(head) >= len(base):  | 
|
72  | 
if head == base:  | 
|
73  | 
            break
 | 
|
74  | 
head, tail = os.path.split(head)  | 
|
75  | 
if tail:  | 
|
76  | 
s.insert(0, tail)  | 
|
77  | 
else:  | 
|
78  | 
from errors import NotBranchError  | 
|
79  | 
raise NotBranchError("path %r is not within branch %r" % (rp, base))  | 
|
80  | 
||
81  | 
return os.sep.join(s)  | 
|
| 
416
by Martin Pool
 - bzr log and bzr root now accept an http URL  | 
82  | 
|
83  | 
||
| 
62
by mbp at sourcefrog
 - new find_branch_root function; based on suggestion from aaron  | 
84  | 
def find_branch_root(f=None):  | 
85  | 
"""Find the branch root enclosing f, or pwd.  | 
|
86  | 
||
| 
416
by Martin Pool
 - bzr log and bzr root now accept an http URL  | 
87  | 
    f may be a filename or a URL.
 | 
88  | 
||
| 
62
by mbp at sourcefrog
 - new find_branch_root function; based on suggestion from aaron  | 
89  | 
    It is not necessary that f exists.
 | 
90  | 
||
91  | 
    Basically we keep looking up until we find the control directory or
 | 
|
92  | 
    run into the root."""
 | 
|
| 
184
by mbp at sourcefrog
 pychecker fixups  | 
93  | 
if f == None:  | 
| 
62
by mbp at sourcefrog
 - new find_branch_root function; based on suggestion from aaron  | 
94  | 
f = os.getcwd()  | 
95  | 
elif hasattr(os.path, 'realpath'):  | 
|
96  | 
f = os.path.realpath(f)  | 
|
97  | 
else:  | 
|
98  | 
f = os.path.abspath(f)  | 
|
| 
425
by Martin Pool
 - check from aaron for existence of a branch  | 
99  | 
if not os.path.exists(f):  | 
100  | 
raise BzrError('%r does not exist' % f)  | 
|
101  | 
||
| 
62
by mbp at sourcefrog
 - new find_branch_root function; based on suggestion from aaron  | 
102  | 
|
103  | 
orig_f = f  | 
|
104  | 
||
105  | 
while True:  | 
|
106  | 
if os.path.exists(os.path.join(f, bzrlib.BZRDIR)):  | 
|
107  | 
return f  | 
|
108  | 
head, tail = os.path.split(f)  | 
|
109  | 
if head == f:  | 
|
110  | 
            # reached the root, whatever that may be
 | 
|
| 
184
by mbp at sourcefrog
 pychecker fixups  | 
111  | 
raise BzrError('%r is not in a branch' % orig_f)  | 
| 
62
by mbp at sourcefrog
 - new find_branch_root function; based on suggestion from aaron  | 
112  | 
f = head  | 
113  | 
||
| 
628
by Martin Pool
 - merge aaron's updated merge/pull code  | 
114  | 
class DivergedBranches(Exception):  | 
115  | 
def __init__(self, branch1, branch2):  | 
|
116  | 
self.branch1 = branch1  | 
|
117  | 
self.branch2 = branch2  | 
|
118  | 
Exception.__init__(self, "These branches have diverged.")  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
119  | 
|
| 
685
by Martin Pool
 - add -r option to the branch command  | 
120  | 
|
121  | 
class NoSuchRevision(BzrError):  | 
|
122  | 
def __init__(self, branch, revision):  | 
|
123  | 
self.branch = branch  | 
|
124  | 
self.revision = revision  | 
|
125  | 
msg = "Branch %s has no revision %d" % (branch, revision)  | 
|
126  | 
BzrError.__init__(self, msg)  | 
|
127  | 
||
128  | 
||
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
129  | 
######################################################################
 | 
130  | 
# branch objects
 | 
|
131  | 
||
| 
558
by Martin Pool
 - All top-level classes inherit from object  | 
132  | 
class Branch(object):  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
133  | 
"""Branch holding a history of revisions.  | 
134  | 
||
| 
343
by Martin Pool
 doc  | 
135  | 
    base
 | 
136  | 
        Base directory of the branch.
 | 
|
| 
578
by Martin Pool
 - start to move toward Branch.lock and unlock methods,  | 
137  | 
|
138  | 
    _lock_mode
 | 
|
| 
580
by Martin Pool
 - Use explicit lock methods on a branch, rather than doing it  | 
139  | 
        None, or 'r' or 'w'
 | 
140  | 
||
141  | 
    _lock_count
 | 
|
142  | 
        If _lock_mode is true, a positive count of the number of times the
 | 
|
143  | 
        lock has been taken.
 | 
|
| 
578
by Martin Pool
 - start to move toward Branch.lock and unlock methods,  | 
144  | 
|
| 
614
by Martin Pool
 - unify two defintions of LockError  | 
145  | 
    _lock
 | 
146  | 
        Lock object from bzrlib.lock.
 | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
147  | 
    """
 | 
| 
564
by Martin Pool
 - Set Branch.base in class def to avoid it being undefined  | 
148  | 
base = None  | 
| 
578
by Martin Pool
 - start to move toward Branch.lock and unlock methods,  | 
149  | 
_lock_mode = None  | 
| 
580
by Martin Pool
 - Use explicit lock methods on a branch, rather than doing it  | 
150  | 
_lock_count = None  | 
| 
615
by Martin Pool
 Major rework of locking code:  | 
151  | 
_lock = None  | 
| 
353
by Martin Pool
 - Per-branch locks in read and write modes.  | 
152  | 
|
| 
897
by Martin Pool
 - merge john's revision-naming code  | 
153  | 
    # Map some sort of prefix into a namespace
 | 
154  | 
    # stuff like "revno:10", "revid:", etc.
 | 
|
155  | 
    # This should match a prefix with a function which accepts
 | 
|
156  | 
REVISION_NAMESPACES = {}  | 
|
157  | 
||
| 
580
by Martin Pool
 - Use explicit lock methods on a branch, rather than doing it  | 
158  | 
def __init__(self, base, init=False, find_root=True):  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
159  | 
"""Create new branch object at a particular location.  | 
160  | 
||
| 
254
by Martin Pool
 - Doc cleanups from Magnus Therning  | 
161  | 
        base -- Base directory for the branch.
 | 
| 
62
by mbp at sourcefrog
 - new find_branch_root function; based on suggestion from aaron  | 
162  | 
        
 | 
| 
254
by Martin Pool
 - Doc cleanups from Magnus Therning  | 
163  | 
        init -- If True, create new control files in a previously
 | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
164  | 
             unversioned directory.  If False, the branch must already
 | 
165  | 
             be versioned.
 | 
|
166  | 
||
| 
254
by Martin Pool
 - Doc cleanups from Magnus Therning  | 
167  | 
        find_root -- If true and init is false, find the root of the
 | 
| 
62
by mbp at sourcefrog
 - new find_branch_root function; based on suggestion from aaron  | 
168  | 
             existing branch containing base.
 | 
169  | 
||
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
170  | 
        In the test suite, creation of new trees is tested using the
 | 
171  | 
        `ScratchBranch` class.
 | 
|
172  | 
        """
 | 
|
| 
800
by Martin Pool
 Merge John's import-speedup branch:  | 
173  | 
from bzrlib.store import ImmutableStore  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
174  | 
if init:  | 
| 
64
by mbp at sourcefrog
 - fix up init command for new find-branch-root function  | 
175  | 
self.base = os.path.realpath(base)  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
176  | 
self._make_control()  | 
| 
62
by mbp at sourcefrog
 - new find_branch_root function; based on suggestion from aaron  | 
177  | 
elif find_root:  | 
178  | 
self.base = find_branch_root(base)  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
179  | 
else:  | 
| 
62
by mbp at sourcefrog
 - new find_branch_root function; based on suggestion from aaron  | 
180  | 
self.base = os.path.realpath(base)  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
181  | 
if not isdir(self.controlfilename('.')):  | 
| 
576
by Martin Pool
 - raise exceptions rather than using bailout()  | 
182  | 
from errors import NotBranchError  | 
183  | 
raise NotBranchError("not a bzr branch: %s" % quotefn(base),  | 
|
184  | 
['use "bzr init" to initialize a new working tree',  | 
|
185  | 
'current bzr can only operate from top-of-tree'])  | 
|
| 
62
by mbp at sourcefrog
 - new find_branch_root function; based on suggestion from aaron  | 
186  | 
self._check_format()  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
187  | 
|
188  | 
self.text_store = ImmutableStore(self.controlfilename('text-store'))  | 
|
189  | 
self.revision_store = ImmutableStore(self.controlfilename('revision-store'))  | 
|
190  | 
self.inventory_store = ImmutableStore(self.controlfilename('inventory-store'))  | 
|
191  | 
||
192  | 
||
193  | 
def __str__(self):  | 
|
194  | 
return '%s(%r)' % (self.__class__.__name__, self.base)  | 
|
195  | 
||
196  | 
||
197  | 
__repr__ = __str__  | 
|
198  | 
||
199  | 
||
| 
578
by Martin Pool
 - start to move toward Branch.lock and unlock methods,  | 
200  | 
def __del__(self):  | 
| 
615
by Martin Pool
 Major rework of locking code:  | 
201  | 
if self._lock_mode or self._lock:  | 
| 
578
by Martin Pool
 - start to move toward Branch.lock and unlock methods,  | 
202  | 
from warnings import warn  | 
203  | 
warn("branch %r was not explicitly unlocked" % self)  | 
|
| 
615
by Martin Pool
 Major rework of locking code:  | 
204  | 
self._lock.unlock()  | 
| 
578
by Martin Pool
 - start to move toward Branch.lock and unlock methods,  | 
205  | 
|
206  | 
||
| 
610
by Martin Pool
 - replace Branch.lock(mode) with separate lock_read and lock_write  | 
207  | 
|
208  | 
def lock_write(self):  | 
|
209  | 
if self._lock_mode:  | 
|
210  | 
if self._lock_mode != 'w':  | 
|
211  | 
from errors import LockError  | 
|
212  | 
raise LockError("can't upgrade to a write lock from %r" %  | 
|
213  | 
self._lock_mode)  | 
|
214  | 
self._lock_count += 1  | 
|
215  | 
else:  | 
|
| 
615
by Martin Pool
 Major rework of locking code:  | 
216  | 
from bzrlib.lock import WriteLock  | 
| 
610
by Martin Pool
 - replace Branch.lock(mode) with separate lock_read and lock_write  | 
217  | 
|
| 
615
by Martin Pool
 Major rework of locking code:  | 
218  | 
self._lock = WriteLock(self.controlfilename('branch-lock'))  | 
| 
610
by Martin Pool
 - replace Branch.lock(mode) with separate lock_read and lock_write  | 
219  | 
self._lock_mode = 'w'  | 
220  | 
self._lock_count = 1  | 
|
221  | 
||
222  | 
||
223  | 
||
224  | 
def lock_read(self):  | 
|
225  | 
if self._lock_mode:  | 
|
226  | 
assert self._lock_mode in ('r', 'w'), \  | 
|
227  | 
"invalid lock mode %r" % self._lock_mode  | 
|
228  | 
self._lock_count += 1  | 
|
229  | 
else:  | 
|
| 
615
by Martin Pool
 Major rework of locking code:  | 
230  | 
from bzrlib.lock import ReadLock  | 
| 
610
by Martin Pool
 - replace Branch.lock(mode) with separate lock_read and lock_write  | 
231  | 
|
| 
615
by Martin Pool
 Major rework of locking code:  | 
232  | 
self._lock = ReadLock(self.controlfilename('branch-lock'))  | 
| 
610
by Martin Pool
 - replace Branch.lock(mode) with separate lock_read and lock_write  | 
233  | 
self._lock_mode = 'r'  | 
234  | 
self._lock_count = 1  | 
|
235  | 
||
236  | 
||
| 
580
by Martin Pool
 - Use explicit lock methods on a branch, rather than doing it  | 
237  | 
|
| 
578
by Martin Pool
 - start to move toward Branch.lock and unlock methods,  | 
238  | 
def unlock(self):  | 
239  | 
if not self._lock_mode:  | 
|
| 
610
by Martin Pool
 - replace Branch.lock(mode) with separate lock_read and lock_write  | 
240  | 
from errors import LockError  | 
241  | 
raise LockError('branch %r is not locked' % (self))  | 
|
| 
580
by Martin Pool
 - Use explicit lock methods on a branch, rather than doing it  | 
242  | 
|
243  | 
if self._lock_count > 1:  | 
|
244  | 
self._lock_count -= 1  | 
|
245  | 
else:  | 
|
| 
615
by Martin Pool
 Major rework of locking code:  | 
246  | 
self._lock.unlock()  | 
247  | 
self._lock = None  | 
|
| 
580
by Martin Pool
 - Use explicit lock methods on a branch, rather than doing it  | 
248  | 
self._lock_mode = self._lock_count = None  | 
| 
353
by Martin Pool
 - Per-branch locks in read and write modes.  | 
249  | 
|
250  | 
||
| 
67
by mbp at sourcefrog
 use abspath() for the function that makes an absolute  | 
251  | 
def abspath(self, name):  | 
252  | 
"""Return absolute filename for something in the branch"""  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
253  | 
return os.path.join(self.base, name)  | 
| 
67
by mbp at sourcefrog
 use abspath() for the function that makes an absolute  | 
254  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
255  | 
|
| 
68
by mbp at sourcefrog
 - new relpath command and function  | 
256  | 
def relpath(self, path):  | 
257  | 
"""Return path relative to this branch of something inside it.  | 
|
258  | 
||
259  | 
        Raises an error if path is not in this branch."""
 | 
|
| 
600
by Martin Pool
 - Better Branch.relpath that doesn't match on  | 
260  | 
return _relpath(self.base, path)  | 
| 
68
by mbp at sourcefrog
 - new relpath command and function  | 
261  | 
|
262  | 
||
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
263  | 
def controlfilename(self, file_or_path):  | 
264  | 
"""Return location relative to branch."""  | 
|
| 
800
by Martin Pool
 Merge John's import-speedup branch:  | 
265  | 
if isinstance(file_or_path, basestring):  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
266  | 
file_or_path = [file_or_path]  | 
267  | 
return os.path.join(self.base, bzrlib.BZRDIR, *file_or_path)  | 
|
268  | 
||
269  | 
||
270  | 
def controlfile(self, file_or_path, mode='r'):  | 
|
| 
245
by mbp at sourcefrog
 - control files always in utf-8-unix format  | 
271  | 
"""Open a control file for this branch.  | 
272  | 
||
273  | 
        There are two classes of file in the control directory: text
 | 
|
274  | 
        and binary.  binary files are untranslated byte streams.  Text
 | 
|
275  | 
        control files are stored with Unix newlines and in UTF-8, even
 | 
|
276  | 
        if the platform or locale defaults are different.
 | 
|
| 
430
by Martin Pool
 doc  | 
277  | 
|
278  | 
        Controlfiles should almost never be opened in write mode but
 | 
|
279  | 
        rather should be atomically copied and replaced using atomicfile.
 | 
|
| 
245
by mbp at sourcefrog
 - control files always in utf-8-unix format  | 
280  | 
        """
 | 
281  | 
||
282  | 
fn = self.controlfilename(file_or_path)  | 
|
283  | 
||
284  | 
if mode == 'rb' or mode == 'wb':  | 
|
285  | 
return file(fn, mode)  | 
|
286  | 
elif mode == 'r' or mode == 'w':  | 
|
| 
259
by Martin Pool
 - use larger file buffers when opening branch control file  | 
287  | 
            # open in binary mode anyhow so there's no newline translation;
 | 
288  | 
            # codecs uses line buffering by default; don't want that.
 | 
|
| 
245
by mbp at sourcefrog
 - control files always in utf-8-unix format  | 
289  | 
import codecs  | 
| 
259
by Martin Pool
 - use larger file buffers when opening branch control file  | 
290  | 
return codecs.open(fn, mode + 'b', 'utf-8',  | 
291  | 
buffering=60000)  | 
|
| 
245
by mbp at sourcefrog
 - control files always in utf-8-unix format  | 
292  | 
else:  | 
293  | 
raise BzrError("invalid controlfile mode %r" % mode)  | 
|
294  | 
||
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
295  | 
|
296  | 
||
297  | 
def _make_control(self):  | 
|
| 
800
by Martin Pool
 Merge John's import-speedup branch:  | 
298  | 
from bzrlib.inventory import Inventory  | 
| 
802
by Martin Pool
 - Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions  | 
299  | 
from bzrlib.xml import pack_xml  | 
300  | 
||
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
301  | 
os.mkdir(self.controlfilename([]))  | 
302  | 
self.controlfile('README', 'w').write(  | 
|
303  | 
"This is a Bazaar-NG control directory.\n"  | 
|
| 
679
by Martin Pool
 - put trailing newline on newly-created .bzr/README  | 
304  | 
"Do not change any files in this directory.\n")  | 
| 
245
by mbp at sourcefrog
 - control files always in utf-8-unix format  | 
305  | 
self.controlfile('branch-format', 'w').write(BZR_BRANCH_FORMAT)  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
306  | 
for d in ('text-store', 'inventory-store', 'revision-store'):  | 
307  | 
os.mkdir(self.controlfilename(d))  | 
|
308  | 
for f in ('revision-history', 'merged-patches',  | 
|
| 
353
by Martin Pool
 - Per-branch locks in read and write modes.  | 
309  | 
'pending-merged-patches', 'branch-name',  | 
| 
815
by Martin Pool
 - track pending-merges  | 
310  | 
'branch-lock',  | 
311  | 
'pending-merges'):  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
312  | 
self.controlfile(f, 'w').write('')  | 
313  | 
mutter('created control directory in ' + self.base)  | 
|
| 
802
by Martin Pool
 - Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions  | 
314  | 
|
| 
909
by Martin Pool
 - merge John's code to give the tree root an explicit file id  | 
315  | 
pack_xml(Inventory(gen_root_id()), self.controlfile('inventory','w'))  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
316  | 
|
317  | 
||
318  | 
def _check_format(self):  | 
|
319  | 
"""Check this branch format is supported.  | 
|
320  | 
||
321  | 
        The current tool only supports the current unstable format.
 | 
|
322  | 
||
323  | 
        In the future, we might need different in-memory Branch
 | 
|
324  | 
        classes to support downlevel branches.  But not yet.
 | 
|
| 
163
by mbp at sourcefrog
 merge win32 portability fixes  | 
325  | 
        """
 | 
326  | 
        # This ignores newlines so that we can open branches created
 | 
|
327  | 
        # on Windows from Linux and so on.  I think it might be better
 | 
|
328  | 
        # to always make all internal files in unix format.
 | 
|
| 
245
by mbp at sourcefrog
 - control files always in utf-8-unix format  | 
329  | 
fmt = self.controlfile('branch-format', 'r').read()  | 
| 
163
by mbp at sourcefrog
 merge win32 portability fixes  | 
330  | 
fmt.replace('\r\n', '')  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
331  | 
if fmt != BZR_BRANCH_FORMAT:  | 
| 
576
by Martin Pool
 - raise exceptions rather than using bailout()  | 
332  | 
raise BzrError('sorry, branch format %r not supported' % fmt,  | 
333  | 
['use a different bzr version',  | 
|
334  | 
'or remove the .bzr directory and "bzr init" again'])  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
335  | 
|
| 
909
by Martin Pool
 - merge John's code to give the tree root an explicit file id  | 
336  | 
def get_root_id(self):  | 
337  | 
"""Return the id of this branches root"""  | 
|
338  | 
inv = self.read_working_inventory()  | 
|
339  | 
return inv.root.file_id  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
340  | 
|
| 
909
by Martin Pool
 - merge John's code to give the tree root an explicit file id  | 
341  | 
def set_root_id(self, file_id):  | 
342  | 
inv = self.read_working_inventory()  | 
|
343  | 
orig_root_id = inv.root.file_id  | 
|
344  | 
del inv._byid[inv.root.file_id]  | 
|
345  | 
inv.root.file_id = file_id  | 
|
346  | 
inv._byid[inv.root.file_id] = inv.root  | 
|
347  | 
for fid in inv:  | 
|
348  | 
entry = inv[fid]  | 
|
349  | 
if entry.parent_id in (None, orig_root_id):  | 
|
350  | 
entry.parent_id = inv.root.file_id  | 
|
351  | 
self._write_inventory(inv)  | 
|
| 
580
by Martin Pool
 - Use explicit lock methods on a branch, rather than doing it  | 
352  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
353  | 
def read_working_inventory(self):  | 
354  | 
"""Read the working inventory."""  | 
|
| 
800
by Martin Pool
 Merge John's import-speedup branch:  | 
355  | 
from bzrlib.inventory import Inventory  | 
| 
802
by Martin Pool
 - Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions  | 
356  | 
from bzrlib.xml import unpack_xml  | 
| 
800
by Martin Pool
 Merge John's import-speedup branch:  | 
357  | 
from time import time  | 
358  | 
before = time()  | 
|
| 
611
by Martin Pool
 - remove @with_writelock, @with_readlock decorators  | 
359  | 
self.lock_read()  | 
360  | 
try:  | 
|
| 
802
by Martin Pool
 - Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions  | 
361  | 
            # ElementTree does its own conversion from UTF-8, so open in
 | 
362  | 
            # binary.
 | 
|
363  | 
inv = unpack_xml(Inventory,  | 
|
| 
961
by Martin Pool
 - remove python2.3 set workarounds  | 
364  | 
self.controlfile('inventory', 'rb'))  | 
| 
611
by Martin Pool
 - remove @with_writelock, @with_readlock decorators  | 
365  | 
mutter("loaded inventory of %d items in %f"  | 
| 
800
by Martin Pool
 Merge John's import-speedup branch:  | 
366  | 
% (len(inv), time() - before))  | 
| 
611
by Martin Pool
 - remove @with_writelock, @with_readlock decorators  | 
367  | 
return inv  | 
368  | 
finally:  | 
|
369  | 
self.unlock()  | 
|
| 
580
by Martin Pool
 - Use explicit lock methods on a branch, rather than doing it  | 
370  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
371  | 
|
372  | 
def _write_inventory(self, inv):  | 
|
373  | 
"""Update the working inventory.  | 
|
374  | 
||
375  | 
        That is to say, the inventory describing changes underway, that
 | 
|
376  | 
        will be committed to the next revision.
 | 
|
377  | 
        """
 | 
|
| 
802
by Martin Pool
 - Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions  | 
378  | 
from bzrlib.atomicfile import AtomicFile  | 
379  | 
from bzrlib.xml import pack_xml  | 
|
380  | 
||
| 
770
by Martin Pool
 - write new working inventory using AtomicFile  | 
381  | 
self.lock_write()  | 
382  | 
try:  | 
|
383  | 
f = AtomicFile(self.controlfilename('inventory'), 'wb')  | 
|
384  | 
try:  | 
|
| 
802
by Martin Pool
 - Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions  | 
385  | 
pack_xml(inv, f)  | 
| 
770
by Martin Pool
 - write new working inventory using AtomicFile  | 
386  | 
f.commit()  | 
387  | 
finally:  | 
|
388  | 
f.close()  | 
|
389  | 
finally:  | 
|
390  | 
self.unlock()  | 
|
391  | 
||
| 
14
by mbp at sourcefrog
 write inventory to temporary file and atomically replace  | 
392  | 
mutter('wrote working inventory')  | 
| 
580
by Martin Pool
 - Use explicit lock methods on a branch, rather than doing it  | 
393  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
394  | 
|
395  | 
inventory = property(read_working_inventory, _write_inventory, None,  | 
|
396  | 
"""Inventory for the working copy.""")  | 
|
397  | 
||
398  | 
||
| 
493
by Martin Pool
 - Merge aaron's merge command  | 
399  | 
def add(self, files, verbose=False, ids=None):  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
400  | 
"""Make files versioned.  | 
401  | 
||
| 
247
by mbp at sourcefrog
 doc  | 
402  | 
        Note that the command line normally calls smart_add instead.
 | 
403  | 
||
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
404  | 
        This puts the files in the Added state, so that they will be
 | 
405  | 
        recorded by the next commit.
 | 
|
406  | 
||
| 
596
by Martin Pool
 doc  | 
407  | 
        files
 | 
408  | 
            List of paths to add, relative to the base of the tree.
 | 
|
409  | 
||
410  | 
        ids
 | 
|
411  | 
            If set, use these instead of automatically generated ids.
 | 
|
412  | 
            Must be the same length as the list of files, but may
 | 
|
413  | 
            contain None for ids that are to be autogenerated.
 | 
|
414  | 
||
| 
254
by Martin Pool
 - Doc cleanups from Magnus Therning  | 
415  | 
        TODO: Perhaps have an option to add the ids even if the files do
 | 
| 
596
by Martin Pool
 doc  | 
416  | 
              not (yet) exist.
 | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
417  | 
|
| 
254
by Martin Pool
 - Doc cleanups from Magnus Therning  | 
418  | 
        TODO: Perhaps return the ids of the files?  But then again it
 | 
| 
596
by Martin Pool
 doc  | 
419  | 
              is easy to retrieve them if they're needed.
 | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
420  | 
|
| 
254
by Martin Pool
 - Doc cleanups from Magnus Therning  | 
421  | 
        TODO: Adding a directory should optionally recurse down and
 | 
| 
596
by Martin Pool
 doc  | 
422  | 
              add all non-ignored children.  Perhaps do that in a
 | 
423  | 
              higher-level method.
 | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
424  | 
        """
 | 
| 
800
by Martin Pool
 Merge John's import-speedup branch:  | 
425  | 
from bzrlib.textui import show_status  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
426  | 
        # TODO: Re-adding a file that is removed in the working copy
 | 
427  | 
        # should probably put it back with the previous ID.
 | 
|
| 
800
by Martin Pool
 Merge John's import-speedup branch:  | 
428  | 
if isinstance(files, basestring):  | 
429  | 
assert(ids is None or isinstance(ids, basestring))  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
430  | 
files = [files]  | 
| 
493
by Martin Pool
 - Merge aaron's merge command  | 
431  | 
if ids is not None:  | 
432  | 
ids = [ids]  | 
|
433  | 
||
434  | 
if ids is None:  | 
|
435  | 
ids = [None] * len(files)  | 
|
436  | 
else:  | 
|
437  | 
assert(len(ids) == len(files))  | 
|
| 
580
by Martin Pool
 - Use explicit lock methods on a branch, rather than doing it  | 
438  | 
|
| 
611
by Martin Pool
 - remove @with_writelock, @with_readlock decorators  | 
439  | 
self.lock_write()  | 
440  | 
try:  | 
|
441  | 
inv = self.read_working_inventory()  | 
|
442  | 
for f,file_id in zip(files, ids):  | 
|
443  | 
if is_control_file(f):  | 
|
444  | 
raise BzrError("cannot add control file %s" % quotefn(f))  | 
|
445  | 
||
446  | 
fp = splitpath(f)  | 
|
447  | 
||
448  | 
if len(fp) == 0:  | 
|
449  | 
raise BzrError("cannot add top-level %r" % f)  | 
|
450  | 
||
451  | 
fullpath = os.path.normpath(self.abspath(f))  | 
|
452  | 
||
453  | 
try:  | 
|
454  | 
kind = file_kind(fullpath)  | 
|
455  | 
except OSError:  | 
|
456  | 
                    # maybe something better?
 | 
|
457  | 
raise BzrError('cannot add: not a regular file or directory: %s' % quotefn(f))  | 
|
458  | 
||
459  | 
if kind != 'file' and kind != 'directory':  | 
|
460  | 
raise BzrError('cannot add: not a regular file or directory: %s' % quotefn(f))  | 
|
461  | 
||
462  | 
if file_id is None:  | 
|
463  | 
file_id = gen_file_id(f)  | 
|
464  | 
inv.add_path(f, kind=kind, file_id=file_id)  | 
|
465  | 
||
466  | 
if verbose:  | 
|
| 
772
by Martin Pool
 - fix verbose output from Branch.add  | 
467  | 
print 'added', quotefn(f)  | 
| 
611
by Martin Pool
 - remove @with_writelock, @with_readlock decorators  | 
468  | 
|
469  | 
mutter("add file %s file_id:{%s} kind=%r" % (f, file_id, kind))  | 
|
470  | 
||
471  | 
self._write_inventory(inv)  | 
|
472  | 
finally:  | 
|
473  | 
self.unlock()  | 
|
| 
70
by mbp at sourcefrog
 Prepare for smart recursive add.  | 
474  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
475  | 
|
| 
176
by mbp at sourcefrog
 New cat command contributed by janmar.  | 
476  | 
def print_file(self, file, revno):  | 
477  | 
"""Print `file` to stdout."""  | 
|
| 
611
by Martin Pool
 - remove @with_writelock, @with_readlock decorators  | 
478  | 
self.lock_read()  | 
479  | 
try:  | 
|
480  | 
tree = self.revision_tree(self.lookup_revision(revno))  | 
|
481  | 
            # use inventory as it was in that revision
 | 
|
482  | 
file_id = tree.inventory.path2id(file)  | 
|
483  | 
if not file_id:  | 
|
| 
897
by Martin Pool
 - merge john's revision-naming code  | 
484  | 
raise BzrError("%r is not present in revision %s" % (file, revno))  | 
| 
611
by Martin Pool
 - remove @with_writelock, @with_readlock decorators  | 
485  | 
tree.print_file(file_id)  | 
486  | 
finally:  | 
|
487  | 
self.unlock()  | 
|
488  | 
||
489  | 
||
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
490  | 
def remove(self, files, verbose=False):  | 
491  | 
"""Mark nominated files for removal from the inventory.  | 
|
492  | 
||
493  | 
        This does not remove their text.  This does not run on 
 | 
|
494  | 
||
| 
254
by Martin Pool
 - Doc cleanups from Magnus Therning  | 
495  | 
        TODO: Refuse to remove modified files unless --force is given?
 | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
496  | 
|
| 
254
by Martin Pool
 - Doc cleanups from Magnus Therning  | 
497  | 
        TODO: Do something useful with directories.
 | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
498  | 
|
| 
254
by Martin Pool
 - Doc cleanups from Magnus Therning  | 
499  | 
        TODO: Should this remove the text or not?  Tough call; not
 | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
500  | 
        removing may be useful and the user can just use use rm, and
 | 
501  | 
        is the opposite of add.  Removing it is consistent with most
 | 
|
502  | 
        other tools.  Maybe an option.
 | 
|
503  | 
        """
 | 
|
| 
800
by Martin Pool
 Merge John's import-speedup branch:  | 
504  | 
from bzrlib.textui import show_status  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
505  | 
        ## TODO: Normalize names
 | 
506  | 
        ## TODO: Remove nested loops; better scalability
 | 
|
| 
800
by Martin Pool
 Merge John's import-speedup branch:  | 
507  | 
if isinstance(files, basestring):  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
508  | 
files = [files]  | 
| 
580
by Martin Pool
 - Use explicit lock methods on a branch, rather than doing it  | 
509  | 
|
| 
611
by Martin Pool
 - remove @with_writelock, @with_readlock decorators  | 
510  | 
self.lock_write()  | 
511  | 
||
512  | 
try:  | 
|
513  | 
tree = self.working_tree()  | 
|
514  | 
inv = tree.inventory  | 
|
515  | 
||
516  | 
            # do this before any modifications
 | 
|
517  | 
for f in files:  | 
|
518  | 
fid = inv.path2id(f)  | 
|
519  | 
if not fid:  | 
|
520  | 
raise BzrError("cannot remove unversioned file %s" % quotefn(f))  | 
|
521  | 
mutter("remove inventory entry %s {%s}" % (quotefn(f), fid))  | 
|
522  | 
if verbose:  | 
|
523  | 
                    # having remove it, it must be either ignored or unknown
 | 
|
524  | 
if tree.is_ignored(f):  | 
|
525  | 
new_status = 'I'  | 
|
526  | 
else:  | 
|
527  | 
new_status = '?'  | 
|
528  | 
show_status(new_status, inv[fid].kind, quotefn(f))  | 
|
529  | 
del inv[fid]  | 
|
530  | 
||
531  | 
self._write_inventory(inv)  | 
|
532  | 
finally:  | 
|
533  | 
self.unlock()  | 
|
534  | 
||
535  | 
||
| 
612
by Martin Pool
 doc  | 
536  | 
    # FIXME: this doesn't need to be a branch method
 | 
| 
493
by Martin Pool
 - Merge aaron's merge command  | 
537  | 
def set_inventory(self, new_inventory_list):  | 
| 
800
by Martin Pool
 Merge John's import-speedup branch:  | 
538  | 
from bzrlib.inventory import Inventory, InventoryEntry  | 
| 
909
by Martin Pool
 - merge John's code to give the tree root an explicit file id  | 
539  | 
inv = Inventory(self.get_root_id())  | 
| 
493
by Martin Pool
 - Merge aaron's merge command  | 
540  | 
for path, file_id, parent, kind in new_inventory_list:  | 
541  | 
name = os.path.basename(path)  | 
|
542  | 
if name == "":  | 
|
543  | 
                continue
 | 
|
544  | 
inv.add(InventoryEntry(file_id, name, kind, parent))  | 
|
545  | 
self._write_inventory(inv)  | 
|
546  | 
||
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
547  | 
|
548  | 
def unknowns(self):  | 
|
549  | 
"""Return all unknown files.  | 
|
550  | 
||
551  | 
        These are files in the working directory that are not versioned or
 | 
|
552  | 
        control files or ignored.
 | 
|
553  | 
        
 | 
|
554  | 
        >>> b = ScratchBranch(files=['foo', 'foo~'])
 | 
|
555  | 
        >>> list(b.unknowns())
 | 
|
556  | 
        ['foo']
 | 
|
557  | 
        >>> b.add('foo')
 | 
|
558  | 
        >>> list(b.unknowns())
 | 
|
559  | 
        []
 | 
|
560  | 
        >>> b.remove('foo')
 | 
|
561  | 
        >>> list(b.unknowns())
 | 
|
562  | 
        ['foo']
 | 
|
563  | 
        """
 | 
|
564  | 
return self.working_tree().unknowns()  | 
|
565  | 
||
566  | 
||
| 
905
by Martin Pool
 - merge aaron's append_multiple.patch  | 
567  | 
def append_revision(self, *revision_ids):  | 
| 
769
by Martin Pool
 - append to branch revision history using AtomicFile  | 
568  | 
from bzrlib.atomicfile import AtomicFile  | 
569  | 
||
| 
905
by Martin Pool
 - merge aaron's append_multiple.patch  | 
570  | 
for revision_id in revision_ids:  | 
571  | 
mutter("add {%s} to revision-history" % revision_id)  | 
|
572  | 
||
573  | 
rev_history = self.revision_history()  | 
|
574  | 
rev_history.extend(revision_ids)  | 
|
| 
769
by Martin Pool
 - append to branch revision history using AtomicFile  | 
575  | 
|
576  | 
f = AtomicFile(self.controlfilename('revision-history'))  | 
|
577  | 
try:  | 
|
578  | 
for rev_id in rev_history:  | 
|
579  | 
print >>f, rev_id  | 
|
580  | 
f.commit()  | 
|
581  | 
finally:  | 
|
582  | 
f.close()  | 
|
| 
233
by mbp at sourcefrog
 - more output from test.sh  | 
583  | 
|
584  | 
||
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
585  | 
def get_revision(self, revision_id):  | 
586  | 
"""Return the Revision object for a named revision"""  | 
|
| 
800
by Martin Pool
 Merge John's import-speedup branch:  | 
587  | 
from bzrlib.revision import Revision  | 
| 
802
by Martin Pool
 - Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions  | 
588  | 
from bzrlib.xml import unpack_xml  | 
589  | 
||
590  | 
self.lock_read()  | 
|
591  | 
try:  | 
|
592  | 
if not revision_id or not isinstance(revision_id, basestring):  | 
|
593  | 
raise ValueError('invalid revision-id: %r' % revision_id)  | 
|
594  | 
r = unpack_xml(Revision, self.revision_store[revision_id])  | 
|
595  | 
finally:  | 
|
596  | 
self.unlock()  | 
|
597  | 
||
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
598  | 
assert r.revision_id == revision_id  | 
599  | 
return r  | 
|
| 
802
by Martin Pool
 - Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions  | 
600  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
601  | 
|
| 
672
by Martin Pool
 - revision records include the hash of their inventory and  | 
602  | 
def get_revision_sha1(self, revision_id):  | 
603  | 
"""Hash the stored value of a revision, and return it."""  | 
|
604  | 
        # In the future, revision entries will be signed. At that
 | 
|
605  | 
        # point, it is probably best *not* to include the signature
 | 
|
606  | 
        # in the revision hash. Because that lets you re-sign
 | 
|
607  | 
        # the revision, (add signatures/remove signatures) and still
 | 
|
608  | 
        # have all hash pointers stay consistent.
 | 
|
609  | 
        # But for now, just hash the contents.
 | 
|
610  | 
return sha_file(self.revision_store[revision_id])  | 
|
611  | 
||
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
612  | 
|
613  | 
def get_inventory(self, inventory_id):  | 
|
614  | 
"""Get Inventory object by hash.  | 
|
615  | 
||
| 
254
by Martin Pool
 - Doc cleanups from Magnus Therning  | 
616  | 
        TODO: Perhaps for this and similar methods, take a revision
 | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
617  | 
               parameter which can be either an integer revno or a
 | 
618  | 
               string hash."""
 | 
|
| 
800
by Martin Pool
 Merge John's import-speedup branch:  | 
619  | 
from bzrlib.inventory import Inventory  | 
| 
802
by Martin Pool
 - Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions  | 
620  | 
from bzrlib.xml import unpack_xml  | 
621  | 
||
622  | 
return unpack_xml(Inventory, self.inventory_store[inventory_id])  | 
|
623  | 
||
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
624  | 
|
| 
672
by Martin Pool
 - revision records include the hash of their inventory and  | 
625  | 
def get_inventory_sha1(self, inventory_id):  | 
626  | 
"""Return the sha1 hash of the inventory entry  | 
|
627  | 
        """
 | 
|
628  | 
return sha_file(self.inventory_store[inventory_id])  | 
|
629  | 
||
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
630  | 
|
631  | 
def get_revision_inventory(self, revision_id):  | 
|
632  | 
"""Return inventory of a past revision."""  | 
|
| 
820
by Martin Pool
 - faster Branch.get_revision_inventory now we know the ids are the same  | 
633  | 
        # bzr 0.0.6 imposes the constraint that the inventory_id
 | 
634  | 
        # must be the same as its revision, so this is trivial.
 | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
635  | 
if revision_id == None:  | 
| 
800
by Martin Pool
 Merge John's import-speedup branch:  | 
636  | 
from bzrlib.inventory import Inventory  | 
| 
909
by Martin Pool
 - merge John's code to give the tree root an explicit file id  | 
637  | 
return Inventory(self.get_root_id())  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
638  | 
else:  | 
| 
820
by Martin Pool
 - faster Branch.get_revision_inventory now we know the ids are the same  | 
639  | 
return self.get_inventory(revision_id)  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
640  | 
|
641  | 
||
642  | 
def revision_history(self):  | 
|
643  | 
"""Return sequence of revision hashes on to this branch.  | 
|
644  | 
||
645  | 
        >>> ScratchBranch().revision_history()
 | 
|
646  | 
        []
 | 
|
647  | 
        """
 | 
|
| 
611
by Martin Pool
 - remove @with_writelock, @with_readlock decorators  | 
648  | 
self.lock_read()  | 
649  | 
try:  | 
|
650  | 
return [l.rstrip('\r\n') for l in  | 
|
651  | 
self.controlfile('revision-history', 'r').readlines()]  | 
|
652  | 
finally:  | 
|
653  | 
self.unlock()  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
654  | 
|
655  | 
||
| 
622
by Martin Pool
 Updated merge patch from Aaron  | 
656  | 
def common_ancestor(self, other, self_revno=None, other_revno=None):  | 
657  | 
"""  | 
|
658  | 
        >>> import commit
 | 
|
659  | 
        >>> sb = ScratchBranch(files=['foo', 'foo~'])
 | 
|
660  | 
        >>> sb.common_ancestor(sb) == (None, None)
 | 
|
661  | 
        True
 | 
|
662  | 
        >>> commit.commit(sb, "Committing first revision", verbose=False)
 | 
|
663  | 
        >>> sb.common_ancestor(sb)[0]
 | 
|
664  | 
        1
 | 
|
665  | 
        >>> clone = sb.clone()
 | 
|
666  | 
        >>> commit.commit(sb, "Committing second revision", verbose=False)
 | 
|
667  | 
        >>> sb.common_ancestor(sb)[0]
 | 
|
668  | 
        2
 | 
|
669  | 
        >>> sb.common_ancestor(clone)[0]
 | 
|
670  | 
        1
 | 
|
671  | 
        >>> commit.commit(clone, "Committing divergent second revision", 
 | 
|
672  | 
        ...               verbose=False)
 | 
|
673  | 
        >>> sb.common_ancestor(clone)[0]
 | 
|
674  | 
        1
 | 
|
675  | 
        >>> sb.common_ancestor(clone) == clone.common_ancestor(sb)
 | 
|
676  | 
        True
 | 
|
677  | 
        >>> sb.common_ancestor(sb) != clone.common_ancestor(clone)
 | 
|
678  | 
        True
 | 
|
679  | 
        >>> clone2 = sb.clone()
 | 
|
680  | 
        >>> sb.common_ancestor(clone2)[0]
 | 
|
681  | 
        2
 | 
|
682  | 
        >>> sb.common_ancestor(clone2, self_revno=1)[0]
 | 
|
683  | 
        1
 | 
|
684  | 
        >>> sb.common_ancestor(clone2, other_revno=1)[0]
 | 
|
685  | 
        1
 | 
|
686  | 
        """
 | 
|
687  | 
my_history = self.revision_history()  | 
|
688  | 
other_history = other.revision_history()  | 
|
689  | 
if self_revno is None:  | 
|
690  | 
self_revno = len(my_history)  | 
|
691  | 
if other_revno is None:  | 
|
692  | 
other_revno = len(other_history)  | 
|
693  | 
indices = range(min((self_revno, other_revno)))  | 
|
694  | 
indices.reverse()  | 
|
695  | 
for r in indices:  | 
|
696  | 
if my_history[r] == other_history[r]:  | 
|
697  | 
return r+1, my_history[r]  | 
|
698  | 
return None, None  | 
|
699  | 
||
| 
385
by Martin Pool
 - New Branch.enum_history method  | 
700  | 
def enum_history(self, direction):  | 
701  | 
"""Return (revno, revision_id) for history of branch.  | 
|
702  | 
||
703  | 
        direction
 | 
|
704  | 
            'forward' is from earliest to latest
 | 
|
705  | 
            'reverse' is from latest to earliest
 | 
|
706  | 
        """
 | 
|
707  | 
rh = self.revision_history()  | 
|
708  | 
if direction == 'forward':  | 
|
709  | 
i = 1  | 
|
710  | 
for rid in rh:  | 
|
711  | 
yield i, rid  | 
|
712  | 
i += 1  | 
|
713  | 
elif direction == 'reverse':  | 
|
714  | 
i = len(rh)  | 
|
715  | 
while i > 0:  | 
|
716  | 
yield i, rh[i-1]  | 
|
717  | 
i -= 1  | 
|
718  | 
else:  | 
|
| 
526
by Martin Pool
 - use ValueError for bad internal parameters  | 
719  | 
raise ValueError('invalid history direction', direction)  | 
| 
385
by Martin Pool
 - New Branch.enum_history method  | 
720  | 
|
721  | 
||
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
722  | 
def revno(self):  | 
723  | 
"""Return current revision number for this branch.  | 
|
724  | 
||
725  | 
        That is equivalent to the number of revisions committed to
 | 
|
726  | 
        this branch.
 | 
|
727  | 
        """
 | 
|
728  | 
return len(self.revision_history())  | 
|
729  | 
||
730  | 
||
731  | 
def last_patch(self):  | 
|
732  | 
"""Return last patch hash, or None if no history.  | 
|
733  | 
        """
 | 
|
734  | 
ph = self.revision_history()  | 
|
735  | 
if ph:  | 
|
736  | 
return ph[-1]  | 
|
| 
184
by mbp at sourcefrog
 pychecker fixups  | 
737  | 
else:  | 
738  | 
return None  | 
|
| 
485
by Martin Pool
 - move commit code into its own module  | 
739  | 
|
740  | 
||
| 
685
by Martin Pool
 - add -r option to the branch command  | 
741  | 
def missing_revisions(self, other, stop_revision=None):  | 
| 
628
by Martin Pool
 - merge aaron's updated merge/pull code  | 
742  | 
"""  | 
743  | 
        If self and other have not diverged, return a list of the revisions
 | 
|
744  | 
        present in other, but missing from self.
 | 
|
745  | 
||
746  | 
        >>> from bzrlib.commit import commit
 | 
|
747  | 
        >>> bzrlib.trace.silent = True
 | 
|
748  | 
        >>> br1 = ScratchBranch()
 | 
|
749  | 
        >>> br2 = ScratchBranch()
 | 
|
750  | 
        >>> br1.missing_revisions(br2)
 | 
|
751  | 
        []
 | 
|
752  | 
        >>> commit(br2, "lala!", rev_id="REVISION-ID-1")
 | 
|
753  | 
        >>> br1.missing_revisions(br2)
 | 
|
754  | 
        [u'REVISION-ID-1']
 | 
|
755  | 
        >>> br2.missing_revisions(br1)
 | 
|
756  | 
        []
 | 
|
757  | 
        >>> commit(br1, "lala!", rev_id="REVISION-ID-1")
 | 
|
758  | 
        >>> br1.missing_revisions(br2)
 | 
|
759  | 
        []
 | 
|
760  | 
        >>> commit(br2, "lala!", rev_id="REVISION-ID-2A")
 | 
|
761  | 
        >>> br1.missing_revisions(br2)
 | 
|
762  | 
        [u'REVISION-ID-2A']
 | 
|
763  | 
        >>> commit(br1, "lala!", rev_id="REVISION-ID-2B")
 | 
|
764  | 
        >>> br1.missing_revisions(br2)
 | 
|
765  | 
        Traceback (most recent call last):
 | 
|
766  | 
        DivergedBranches: These branches have diverged.
 | 
|
767  | 
        """
 | 
|
768  | 
self_history = self.revision_history()  | 
|
769  | 
self_len = len(self_history)  | 
|
770  | 
other_history = other.revision_history()  | 
|
771  | 
other_len = len(other_history)  | 
|
772  | 
common_index = min(self_len, other_len) -1  | 
|
773  | 
if common_index >= 0 and \  | 
|
774  | 
self_history[common_index] != other_history[common_index]:  | 
|
775  | 
raise DivergedBranches(self, other)  | 
|
| 
685
by Martin Pool
 - add -r option to the branch command  | 
776  | 
|
777  | 
if stop_revision is None:  | 
|
778  | 
stop_revision = other_len  | 
|
779  | 
elif stop_revision > other_len:  | 
|
780  | 
raise NoSuchRevision(self, stop_revision)  | 
|
781  | 
||
782  | 
return other_history[self_len:stop_revision]  | 
|
783  | 
||
784  | 
||
785  | 
def update_revisions(self, other, stop_revision=None):  | 
|
| 
663
by Martin Pool
 doc  | 
786  | 
"""Pull in all new revisions from other branch.  | 
787  | 
        
 | 
|
| 
628
by Martin Pool
 - merge aaron's updated merge/pull code  | 
788  | 
        >>> from bzrlib.commit import commit
 | 
789  | 
        >>> bzrlib.trace.silent = True
 | 
|
790  | 
        >>> br1 = ScratchBranch(files=['foo', 'bar'])
 | 
|
791  | 
        >>> br1.add('foo')
 | 
|
792  | 
        >>> br1.add('bar')
 | 
|
793  | 
        >>> commit(br1, "lala!", rev_id="REVISION-ID-1", verbose=False)
 | 
|
794  | 
        >>> br2 = ScratchBranch()
 | 
|
795  | 
        >>> br2.update_revisions(br1)
 | 
|
796  | 
        Added 2 texts.
 | 
|
797  | 
        Added 1 inventories.
 | 
|
798  | 
        Added 1 revisions.
 | 
|
799  | 
        >>> br2.revision_history()
 | 
|
800  | 
        [u'REVISION-ID-1']
 | 
|
801  | 
        >>> br2.update_revisions(br1)
 | 
|
802  | 
        Added 0 texts.
 | 
|
803  | 
        Added 0 inventories.
 | 
|
804  | 
        Added 0 revisions.
 | 
|
805  | 
        >>> br1.text_store.total_size() == br2.text_store.total_size()
 | 
|
806  | 
        True
 | 
|
807  | 
        """
 | 
|
| 
670
by Martin Pool
 - Show progress while branching  | 
808  | 
from bzrlib.progress import ProgressBar  | 
809  | 
||
810  | 
pb = ProgressBar()  | 
|
811  | 
||
812  | 
pb.update('comparing histories')  | 
|
| 
685
by Martin Pool
 - add -r option to the branch command  | 
813  | 
revision_ids = self.missing_revisions(other, stop_revision)  | 
| 
790
by Martin Pool
 Merge from aaron:  | 
814  | 
|
815  | 
if hasattr(other.revision_store, "prefetch"):  | 
|
816  | 
other.revision_store.prefetch(revision_ids)  | 
|
817  | 
if hasattr(other.inventory_store, "prefetch"):  | 
|
818  | 
inventory_ids = [other.get_revision(r).inventory_id  | 
|
819  | 
for r in revision_ids]  | 
|
820  | 
other.inventory_store.prefetch(inventory_ids)  | 
|
821  | 
||
| 
670
by Martin Pool
 - Show progress while branching  | 
822  | 
revisions = []  | 
| 
800
by Martin Pool
 Merge John's import-speedup branch:  | 
823  | 
needed_texts = set()  | 
| 
670
by Martin Pool
 - Show progress while branching  | 
824  | 
i = 0  | 
825  | 
for rev_id in revision_ids:  | 
|
826  | 
i += 1  | 
|
827  | 
pb.update('fetching revision', i, len(revision_ids))  | 
|
828  | 
rev = other.get_revision(rev_id)  | 
|
829  | 
revisions.append(rev)  | 
|
| 
628
by Martin Pool
 - merge aaron's updated merge/pull code  | 
830  | 
inv = other.get_inventory(str(rev.inventory_id))  | 
831  | 
for key, entry in inv.iter_entries():  | 
|
832  | 
if entry.text_id is None:  | 
|
833  | 
                    continue
 | 
|
834  | 
if entry.text_id not in self.text_store:  | 
|
835  | 
needed_texts.add(entry.text_id)  | 
|
| 
670
by Martin Pool
 - Show progress while branching  | 
836  | 
|
837  | 
pb.clear()  | 
|
838  | 
||
| 
628
by Martin Pool
 - merge aaron's updated merge/pull code  | 
839  | 
count = self.text_store.copy_multi(other.text_store, needed_texts)  | 
840  | 
print "Added %d texts." % count  | 
|
841  | 
inventory_ids = [ f.inventory_id for f in revisions ]  | 
|
842  | 
count = self.inventory_store.copy_multi(other.inventory_store,  | 
|
843  | 
inventory_ids)  | 
|
844  | 
print "Added %d inventories." % count  | 
|
845  | 
revision_ids = [ f.revision_id for f in revisions]  | 
|
846  | 
count = self.revision_store.copy_multi(other.revision_store,  | 
|
847  | 
revision_ids)  | 
|
848  | 
for revision_id in revision_ids:  | 
|
849  | 
self.append_revision(revision_id)  | 
|
850  | 
print "Added %d revisions." % count  | 
|
851  | 
||
852  | 
||
| 
485
by Martin Pool
 - move commit code into its own module  | 
853  | 
def commit(self, *args, **kw):  | 
854  | 
from bzrlib.commit import commit  | 
|
855  | 
commit(self, *args, **kw)  | 
|
| 
184
by mbp at sourcefrog
 pychecker fixups  | 
856  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
857  | 
|
| 
897
by Martin Pool
 - merge john's revision-naming code  | 
858  | 
def lookup_revision(self, revision):  | 
859  | 
"""Return the revision identifier for a given revision information."""  | 
|
860  | 
revno, info = self.get_revision_info(revision)  | 
|
861  | 
return info  | 
|
862  | 
||
863  | 
def get_revision_info(self, revision):  | 
|
864  | 
"""Return (revno, revision id) for revision identifier.  | 
|
865  | 
||
866  | 
        revision can be an integer, in which case it is assumed to be revno (though
 | 
|
867  | 
            this will translate negative values into positive ones)
 | 
|
868  | 
        revision can also be a string, in which case it is parsed for something like
 | 
|
869  | 
            'date:' or 'revid:' etc.
 | 
|
870  | 
        """
 | 
|
871  | 
if revision is None:  | 
|
872  | 
return 0, None  | 
|
873  | 
revno = None  | 
|
874  | 
try:# Convert to int if possible  | 
|
875  | 
revision = int(revision)  | 
|
876  | 
except ValueError:  | 
|
877  | 
            pass
 | 
|
878  | 
revs = self.revision_history()  | 
|
879  | 
if isinstance(revision, int):  | 
|
880  | 
if revision == 0:  | 
|
881  | 
return 0, None  | 
|
882  | 
            # Mabye we should do this first, but we don't need it if revision == 0
 | 
|
883  | 
if revision < 0:  | 
|
884  | 
revno = len(revs) + revision + 1  | 
|
885  | 
else:  | 
|
886  | 
revno = revision  | 
|
887  | 
elif isinstance(revision, basestring):  | 
|
888  | 
for prefix, func in Branch.REVISION_NAMESPACES.iteritems():  | 
|
889  | 
if revision.startswith(prefix):  | 
|
890  | 
revno = func(self, revs, revision)  | 
|
891  | 
                    break
 | 
|
892  | 
else:  | 
|
893  | 
raise BzrError('No namespace registered for string: %r' % revision)  | 
|
894  | 
||
895  | 
if revno is None or revno <= 0 or revno > len(revs):  | 
|
896  | 
raise BzrError("no such revision %s" % revision)  | 
|
897  | 
return revno, revs[revno-1]  | 
|
898  | 
||
899  | 
def _namespace_revno(self, revs, revision):  | 
|
900  | 
"""Lookup a revision by revision number"""  | 
|
901  | 
assert revision.startswith('revno:')  | 
|
902  | 
try:  | 
|
903  | 
return int(revision[6:])  | 
|
904  | 
except ValueError:  | 
|
905  | 
return None  | 
|
906  | 
REVISION_NAMESPACES['revno:'] = _namespace_revno  | 
|
907  | 
||
908  | 
def _namespace_revid(self, revs, revision):  | 
|
909  | 
assert revision.startswith('revid:')  | 
|
910  | 
try:  | 
|
911  | 
return revs.index(revision[6:]) + 1  | 
|
912  | 
except ValueError:  | 
|
913  | 
return None  | 
|
914  | 
REVISION_NAMESPACES['revid:'] = _namespace_revid  | 
|
915  | 
||
916  | 
def _namespace_last(self, revs, revision):  | 
|
917  | 
assert revision.startswith('last:')  | 
|
918  | 
try:  | 
|
919  | 
offset = int(revision[5:])  | 
|
920  | 
except ValueError:  | 
|
921  | 
return None  | 
|
922  | 
else:  | 
|
923  | 
if offset <= 0:  | 
|
924  | 
raise BzrError('You must supply a positive value for --revision last:XXX')  | 
|
925  | 
return len(revs) - offset + 1  | 
|
926  | 
REVISION_NAMESPACES['last:'] = _namespace_last  | 
|
927  | 
||
928  | 
def _namespace_tag(self, revs, revision):  | 
|
929  | 
assert revision.startswith('tag:')  | 
|
930  | 
raise BzrError('tag: namespace registered, but not implemented.')  | 
|
931  | 
REVISION_NAMESPACES['tag:'] = _namespace_tag  | 
|
932  | 
||
933  | 
def _namespace_date(self, revs, revision):  | 
|
934  | 
assert revision.startswith('date:')  | 
|
935  | 
import datetime  | 
|
936  | 
        # Spec for date revisions:
 | 
|
937  | 
        #   date:value
 | 
|
938  | 
        #   value can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.
 | 
|
939  | 
        #   it can also start with a '+/-/='. '+' says match the first
 | 
|
940  | 
        #   entry after the given date. '-' is match the first entry before the date
 | 
|
941  | 
        #   '=' is match the first entry after, but still on the given date.
 | 
|
942  | 
        #
 | 
|
943  | 
        #   +2005-05-12 says find the first matching entry after May 12th, 2005 at 0:00
 | 
|
944  | 
        #   -2005-05-12 says find the first matching entry before May 12th, 2005 at 0:00
 | 
|
945  | 
        #   =2005-05-12 says find the first match after May 12th, 2005 at 0:00 but before
 | 
|
946  | 
        #       May 13th, 2005 at 0:00
 | 
|
947  | 
        #
 | 
|
948  | 
        #   So the proper way of saying 'give me all entries for today' is:
 | 
|
949  | 
        #       -r {date:+today}:{date:-tomorrow}
 | 
|
950  | 
        #   The default is '=' when not supplied
 | 
|
951  | 
val = revision[5:]  | 
|
952  | 
match_style = '='  | 
|
953  | 
if val[:1] in ('+', '-', '='):  | 
|
954  | 
match_style = val[:1]  | 
|
955  | 
val = val[1:]  | 
|
956  | 
||
957  | 
today = datetime.datetime.today().replace(hour=0,minute=0,second=0,microsecond=0)  | 
|
958  | 
if val.lower() == 'yesterday':  | 
|
959  | 
dt = today - datetime.timedelta(days=1)  | 
|
960  | 
elif val.lower() == 'today':  | 
|
961  | 
dt = today  | 
|
962  | 
elif val.lower() == 'tomorrow':  | 
|
963  | 
dt = today + datetime.timedelta(days=1)  | 
|
964  | 
else:  | 
|
| 
901
by Martin Pool
 - fix missing import  | 
965  | 
import re  | 
| 
897
by Martin Pool
 - merge john's revision-naming code  | 
966  | 
            # This should be done outside the function to avoid recompiling it.
 | 
967  | 
_date_re = re.compile(  | 
|
968  | 
r'(?P<date>(?P<year>\d\d\d\d)-(?P<month>\d\d)-(?P<day>\d\d))?'  | 
|
969  | 
r'(,|T)?\s*'  | 
|
970  | 
r'(?P<time>(?P<hour>\d\d):(?P<minute>\d\d)(:(?P<second>\d\d))?)?'  | 
|
971  | 
                )
 | 
|
972  | 
m = _date_re.match(val)  | 
|
973  | 
if not m or (not m.group('date') and not m.group('time')):  | 
|
974  | 
raise BzrError('Invalid revision date %r' % revision)  | 
|
975  | 
||
976  | 
if m.group('date'):  | 
|
977  | 
year, month, day = int(m.group('year')), int(m.group('month')), int(m.group('day'))  | 
|
978  | 
else:  | 
|
979  | 
year, month, day = today.year, today.month, today.day  | 
|
980  | 
if m.group('time'):  | 
|
981  | 
hour = int(m.group('hour'))  | 
|
982  | 
minute = int(m.group('minute'))  | 
|
983  | 
if m.group('second'):  | 
|
984  | 
second = int(m.group('second'))  | 
|
985  | 
else:  | 
|
986  | 
second = 0  | 
|
987  | 
else:  | 
|
988  | 
hour, minute, second = 0,0,0  | 
|
989  | 
||
990  | 
dt = datetime.datetime(year=year, month=month, day=day,  | 
|
991  | 
hour=hour, minute=minute, second=second)  | 
|
992  | 
first = dt  | 
|
993  | 
last = None  | 
|
994  | 
reversed = False  | 
|
995  | 
if match_style == '-':  | 
|
996  | 
reversed = True  | 
|
997  | 
elif match_style == '=':  | 
|
998  | 
last = dt + datetime.timedelta(days=1)  | 
|
999  | 
||
1000  | 
if reversed:  | 
|
1001  | 
for i in range(len(revs)-1, -1, -1):  | 
|
1002  | 
r = self.get_revision(revs[i])  | 
|
1003  | 
                # TODO: Handle timezone.
 | 
|
1004  | 
dt = datetime.datetime.fromtimestamp(r.timestamp)  | 
|
1005  | 
if first >= dt and (last is None or dt >= last):  | 
|
1006  | 
return i+1  | 
|
1007  | 
else:  | 
|
1008  | 
for i in range(len(revs)):  | 
|
1009  | 
r = self.get_revision(revs[i])  | 
|
1010  | 
                # TODO: Handle timezone.
 | 
|
1011  | 
dt = datetime.datetime.fromtimestamp(r.timestamp)  | 
|
1012  | 
if first <= dt and (last is None or dt <= last):  | 
|
1013  | 
return i+1  | 
|
1014  | 
REVISION_NAMESPACES['date:'] = _namespace_date  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
1015  | 
|
1016  | 
def revision_tree(self, revision_id):  | 
|
1017  | 
"""Return Tree for a revision on this branch.  | 
|
1018  | 
||
1019  | 
        `revision_id` may be None for the null revision, in which case
 | 
|
1020  | 
        an `EmptyTree` is returned."""
 | 
|
| 
800
by Martin Pool
 Merge John's import-speedup branch:  | 
1021  | 
from bzrlib.tree import EmptyTree, RevisionTree  | 
| 
529
by Martin Pool
 todo  | 
1022  | 
        # TODO: refactor this to use an existing revision object
 | 
1023  | 
        # so we don't need to read it in twice.
 | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
1024  | 
if revision_id == None:  | 
| 
909
by Martin Pool
 - merge John's code to give the tree root an explicit file id  | 
1025  | 
return EmptyTree(self.get_root_id())  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
1026  | 
else:  | 
1027  | 
inv = self.get_revision_inventory(revision_id)  | 
|
1028  | 
return RevisionTree(self.text_store, inv)  | 
|
1029  | 
||
1030  | 
||
1031  | 
def working_tree(self):  | 
|
1032  | 
"""Return a `Tree` for the working copy."""  | 
|
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
1033  | 
from workingtree import WorkingTree  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
1034  | 
return WorkingTree(self.base, self.read_working_inventory())  | 
1035  | 
||
1036  | 
||
1037  | 
def basis_tree(self):  | 
|
1038  | 
"""Return `Tree` object for last revision.  | 
|
1039  | 
||
1040  | 
        If there are no revisions yet, return an `EmptyTree`.
 | 
|
1041  | 
        """
 | 
|
| 
800
by Martin Pool
 Merge John's import-speedup branch:  | 
1042  | 
from bzrlib.tree import EmptyTree, RevisionTree  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
1043  | 
r = self.last_patch()  | 
1044  | 
if r == None:  | 
|
| 
909
by Martin Pool
 - merge John's code to give the tree root an explicit file id  | 
1045  | 
return EmptyTree(self.get_root_id())  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
1046  | 
else:  | 
1047  | 
return RevisionTree(self.text_store, self.get_revision_inventory(r))  | 
|
1048  | 
||
1049  | 
||
1050  | 
||
| 
168
by mbp at sourcefrog
 new "rename" command  | 
1051  | 
def rename_one(self, from_rel, to_rel):  | 
| 
309
by Martin Pool
 doc  | 
1052  | 
"""Rename one file.  | 
1053  | 
||
1054  | 
        This can change the directory or the filename or both.
 | 
|
| 
353
by Martin Pool
 - Per-branch locks in read and write modes.  | 
1055  | 
        """
 | 
| 
611
by Martin Pool
 - remove @with_writelock, @with_readlock decorators  | 
1056  | 
self.lock_write()  | 
| 
171
by mbp at sourcefrog
 better error message when working file rename fails  | 
1057  | 
try:  | 
| 
611
by Martin Pool
 - remove @with_writelock, @with_readlock decorators  | 
1058  | 
tree = self.working_tree()  | 
1059  | 
inv = tree.inventory  | 
|
1060  | 
if not tree.has_filename(from_rel):  | 
|
1061  | 
raise BzrError("can't rename: old working file %r does not exist" % from_rel)  | 
|
1062  | 
if tree.has_filename(to_rel):  | 
|
1063  | 
raise BzrError("can't rename: new working file %r already exists" % to_rel)  | 
|
1064  | 
||
1065  | 
file_id = inv.path2id(from_rel)  | 
|
1066  | 
if file_id == None:  | 
|
1067  | 
raise BzrError("can't rename: old name %r is not versioned" % from_rel)  | 
|
1068  | 
||
1069  | 
if inv.path2id(to_rel):  | 
|
1070  | 
raise BzrError("can't rename: new name %r is already versioned" % to_rel)  | 
|
1071  | 
||
1072  | 
to_dir, to_tail = os.path.split(to_rel)  | 
|
1073  | 
to_dir_id = inv.path2id(to_dir)  | 
|
1074  | 
if to_dir_id == None and to_dir != '':  | 
|
1075  | 
raise BzrError("can't determine destination directory id for %r" % to_dir)  | 
|
1076  | 
||
1077  | 
mutter("rename_one:")  | 
|
1078  | 
mutter(" file_id {%s}" % file_id)  | 
|
1079  | 
mutter(" from_rel %r" % from_rel)  | 
|
1080  | 
mutter(" to_rel %r" % to_rel)  | 
|
1081  | 
mutter(" to_dir %r" % to_dir)  | 
|
1082  | 
mutter(" to_dir_id {%s}" % to_dir_id)  | 
|
1083  | 
||
1084  | 
inv.rename(file_id, to_dir_id, to_tail)  | 
|
1085  | 
||
1086  | 
print "%s => %s" % (from_rel, to_rel)  | 
|
1087  | 
||
1088  | 
from_abs = self.abspath(from_rel)  | 
|
1089  | 
to_abs = self.abspath(to_rel)  | 
|
1090  | 
try:  | 
|
1091  | 
os.rename(from_abs, to_abs)  | 
|
1092  | 
except OSError, e:  | 
|
1093  | 
raise BzrError("failed to rename %r to %r: %s"  | 
|
1094  | 
% (from_abs, to_abs, e[1]),  | 
|
1095  | 
["rename rolled back"])  | 
|
1096  | 
||
1097  | 
self._write_inventory(inv)  | 
|
1098  | 
finally:  | 
|
1099  | 
self.unlock()  | 
|
1100  | 
||
1101  | 
||
| 
174
by mbp at sourcefrog
 - New 'move' command; now separated out from rename  | 
1102  | 
def move(self, from_paths, to_name):  | 
| 
160
by mbp at sourcefrog
 - basic support for moving files to different directories - have not done support for renaming them yet, but should be straightforward - some tests, but many cases are not handled yet i think  | 
1103  | 
"""Rename files.  | 
1104  | 
||
| 
174
by mbp at sourcefrog
 - New 'move' command; now separated out from rename  | 
1105  | 
        to_name must exist as a versioned directory.
 | 
1106  | 
||
| 
160
by mbp at sourcefrog
 - basic support for moving files to different directories - have not done support for renaming them yet, but should be straightforward - some tests, but many cases are not handled yet i think  | 
1107  | 
        If to_name exists and is a directory, the files are moved into
 | 
1108  | 
        it, keeping their old names.  If it is a directory, 
 | 
|
1109  | 
||
1110  | 
        Note that to_name is only the last component of the new name;
 | 
|
1111  | 
        this doesn't change the directory.
 | 
|
1112  | 
        """
 | 
|
| 
611
by Martin Pool
 - remove @with_writelock, @with_readlock decorators  | 
1113  | 
self.lock_write()  | 
1114  | 
try:  | 
|
1115  | 
            ## TODO: Option to move IDs only
 | 
|
1116  | 
assert not isinstance(from_paths, basestring)  | 
|
1117  | 
tree = self.working_tree()  | 
|
1118  | 
inv = tree.inventory  | 
|
1119  | 
to_abs = self.abspath(to_name)  | 
|
1120  | 
if not isdir(to_abs):  | 
|
1121  | 
raise BzrError("destination %r is not a directory" % to_abs)  | 
|
1122  | 
if not tree.has_filename(to_name):  | 
|
1123  | 
raise BzrError("destination %r not in working directory" % to_abs)  | 
|
1124  | 
to_dir_id = inv.path2id(to_name)  | 
|
1125  | 
if to_dir_id == None and to_name != '':  | 
|
1126  | 
raise BzrError("destination %r is not a versioned directory" % to_name)  | 
|
1127  | 
to_dir_ie = inv[to_dir_id]  | 
|
1128  | 
if to_dir_ie.kind not in ('directory', 'root_directory'):  | 
|
1129  | 
raise BzrError("destination %r is not a directory" % to_abs)  | 
|
1130  | 
||
1131  | 
to_idpath = inv.get_idpath(to_dir_id)  | 
|
1132  | 
||
1133  | 
for f in from_paths:  | 
|
1134  | 
if not tree.has_filename(f):  | 
|
1135  | 
raise BzrError("%r does not exist in working tree" % f)  | 
|
1136  | 
f_id = inv.path2id(f)  | 
|
1137  | 
if f_id == None:  | 
|
1138  | 
raise BzrError("%r is not versioned" % f)  | 
|
1139  | 
name_tail = splitpath(f)[-1]  | 
|
1140  | 
dest_path = appendpath(to_name, name_tail)  | 
|
1141  | 
if tree.has_filename(dest_path):  | 
|
1142  | 
raise BzrError("destination %r already exists" % dest_path)  | 
|
1143  | 
if f_id in to_idpath:  | 
|
1144  | 
raise BzrError("can't move %r to a subdirectory of itself" % f)  | 
|
1145  | 
||
1146  | 
            # OK, so there's a race here, it's possible that someone will
 | 
|
1147  | 
            # create a file in this interval and then the rename might be
 | 
|
1148  | 
            # left half-done.  But we should have caught most problems.
 | 
|
1149  | 
||
1150  | 
for f in from_paths:  | 
|
1151  | 
name_tail = splitpath(f)[-1]  | 
|
1152  | 
dest_path = appendpath(to_name, name_tail)  | 
|
1153  | 
print "%s => %s" % (f, dest_path)  | 
|
1154  | 
inv.rename(inv.path2id(f), to_dir_id, name_tail)  | 
|
1155  | 
try:  | 
|
1156  | 
os.rename(self.abspath(f), self.abspath(dest_path))  | 
|
1157  | 
except OSError, e:  | 
|
1158  | 
raise BzrError("failed to rename %r to %r: %s" % (f, dest_path, e[1]),  | 
|
1159  | 
["rename rolled back"])  | 
|
1160  | 
||
1161  | 
self._write_inventory(inv)  | 
|
1162  | 
finally:  | 
|
1163  | 
self.unlock()  | 
|
| 
160
by mbp at sourcefrog
 - basic support for moving files to different directories - have not done support for renaming them yet, but should be straightforward - some tests, but many cases are not handled yet i think  | 
1164  | 
|
1165  | 
||
| 
782
by Martin Pool
 - Branch.revert copies files to backups before reverting them  | 
1166  | 
def revert(self, filenames, old_tree=None, backups=True):  | 
| 
778
by Martin Pool
 - simple revert of text files  | 
1167  | 
"""Restore selected files to the versions from a previous tree.  | 
| 
782
by Martin Pool
 - Branch.revert copies files to backups before reverting them  | 
1168  | 
|
1169  | 
        backups
 | 
|
1170  | 
            If true (default) backups are made of files before
 | 
|
1171  | 
            they're renamed.
 | 
|
| 
778
by Martin Pool
 - simple revert of text files  | 
1172  | 
        """
 | 
1173  | 
from bzrlib.errors import NotVersionedError, BzrError  | 
|
1174  | 
from bzrlib.atomicfile import AtomicFile  | 
|
| 
782
by Martin Pool
 - Branch.revert copies files to backups before reverting them  | 
1175  | 
from bzrlib.osutils import backup_file  | 
| 
778
by Martin Pool
 - simple revert of text files  | 
1176  | 
|
1177  | 
inv = self.read_working_inventory()  | 
|
1178  | 
if old_tree is None:  | 
|
1179  | 
old_tree = self.basis_tree()  | 
|
1180  | 
old_inv = old_tree.inventory  | 
|
1181  | 
||
1182  | 
nids = []  | 
|
1183  | 
for fn in filenames:  | 
|
1184  | 
file_id = inv.path2id(fn)  | 
|
1185  | 
if not file_id:  | 
|
1186  | 
raise NotVersionedError("not a versioned file", fn)  | 
|
| 
782
by Martin Pool
 - Branch.revert copies files to backups before reverting them  | 
1187  | 
if not old_inv.has_id(file_id):  | 
1188  | 
raise BzrError("file not present in old tree", fn, file_id)  | 
|
| 
778
by Martin Pool
 - simple revert of text files  | 
1189  | 
nids.append((fn, file_id))  | 
1190  | 
||
1191  | 
        # TODO: Rename back if it was previously at a different location
 | 
|
1192  | 
||
1193  | 
        # TODO: If given a directory, restore the entire contents from
 | 
|
1194  | 
        # the previous version.
 | 
|
1195  | 
||
1196  | 
        # TODO: Make a backup to a temporary file.
 | 
|
1197  | 
||
1198  | 
        # TODO: If the file previously didn't exist, delete it?
 | 
|
1199  | 
for fn, file_id in nids:  | 
|
| 
782
by Martin Pool
 - Branch.revert copies files to backups before reverting them  | 
1200  | 
backup_file(fn)  | 
1201  | 
||
| 
778
by Martin Pool
 - simple revert of text files  | 
1202  | 
f = AtomicFile(fn, 'wb')  | 
1203  | 
try:  | 
|
1204  | 
f.write(old_tree.get_file(file_id).read())  | 
|
1205  | 
f.commit()  | 
|
1206  | 
finally:  | 
|
1207  | 
f.close()  | 
|
1208  | 
||
1209  | 
||
| 
815
by Martin Pool
 - track pending-merges  | 
1210  | 
def pending_merges(self):  | 
1211  | 
"""Return a list of pending merges.  | 
|
1212  | 
||
1213  | 
        These are revisions that have been merged into the working
 | 
|
1214  | 
        directory but not yet committed.
 | 
|
1215  | 
        """
 | 
|
1216  | 
cfn = self.controlfilename('pending-merges')  | 
|
1217  | 
if not os.path.exists(cfn):  | 
|
1218  | 
return []  | 
|
1219  | 
p = []  | 
|
1220  | 
for l in self.controlfile('pending-merges', 'r').readlines():  | 
|
1221  | 
p.append(l.rstrip('\n'))  | 
|
1222  | 
return p  | 
|
1223  | 
||
1224  | 
||
1225  | 
def add_pending_merge(self, revision_id):  | 
|
1226  | 
from bzrlib.revision import validate_revision_id  | 
|
1227  | 
||
1228  | 
validate_revision_id(revision_id)  | 
|
1229  | 
||
1230  | 
p = self.pending_merges()  | 
|
1231  | 
if revision_id in p:  | 
|
1232  | 
            return
 | 
|
1233  | 
p.append(revision_id)  | 
|
1234  | 
self.set_pending_merges(p)  | 
|
1235  | 
||
1236  | 
||
1237  | 
def set_pending_merges(self, rev_list):  | 
|
1238  | 
from bzrlib.atomicfile import AtomicFile  | 
|
1239  | 
self.lock_write()  | 
|
1240  | 
try:  | 
|
1241  | 
f = AtomicFile(self.controlfilename('pending-merges'))  | 
|
1242  | 
try:  | 
|
1243  | 
for l in rev_list:  | 
|
1244  | 
print >>f, l  | 
|
1245  | 
f.commit()  | 
|
1246  | 
finally:  | 
|
1247  | 
f.close()  | 
|
1248  | 
finally:  | 
|
1249  | 
self.unlock()  | 
|
1250  | 
||
1251  | 
||
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
1252  | 
|
1253  | 
class ScratchBranch(Branch):  | 
|
1254  | 
"""Special test class: a branch that cleans up after itself.  | 
|
1255  | 
||
1256  | 
    >>> b = ScratchBranch()
 | 
|
1257  | 
    >>> isdir(b.base)
 | 
|
1258  | 
    True
 | 
|
1259  | 
    >>> bd = b.base
 | 
|
| 
396
by Martin Pool
 - Using the destructor on a ScratchBranch is not reliable;  | 
1260  | 
    >>> b.destroy()
 | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
1261  | 
    >>> isdir(bd)
 | 
1262  | 
    False
 | 
|
1263  | 
    """
 | 
|
| 
622
by Martin Pool
 Updated merge patch from Aaron  | 
1264  | 
def __init__(self, files=[], dirs=[], base=None):  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
1265  | 
"""Make a test branch.  | 
1266  | 
||
1267  | 
        This creates a temporary directory and runs init-tree in it.
 | 
|
1268  | 
||
1269  | 
        If any files are listed, they are created in the working copy.
 | 
|
1270  | 
        """
 | 
|
| 
800
by Martin Pool
 Merge John's import-speedup branch:  | 
1271  | 
from tempfile import mkdtemp  | 
| 
622
by Martin Pool
 Updated merge patch from Aaron  | 
1272  | 
init = False  | 
1273  | 
if base is None:  | 
|
| 
800
by Martin Pool
 Merge John's import-speedup branch:  | 
1274  | 
base = mkdtemp()  | 
| 
622
by Martin Pool
 Updated merge patch from Aaron  | 
1275  | 
init = True  | 
1276  | 
Branch.__init__(self, base, init=init)  | 
|
| 
100
by mbp at sourcefrog
 - add test case for ignore files  | 
1277  | 
for d in dirs:  | 
1278  | 
os.mkdir(self.abspath(d))  | 
|
1279  | 
||
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
1280  | 
for f in files:  | 
1281  | 
file(os.path.join(self.base, f), 'w').write('content of %s' % f)  | 
|
1282  | 
||
1283  | 
||
| 
622
by Martin Pool
 Updated merge patch from Aaron  | 
1284  | 
def clone(self):  | 
1285  | 
"""  | 
|
1286  | 
        >>> orig = ScratchBranch(files=["file1", "file2"])
 | 
|
1287  | 
        >>> clone = orig.clone()
 | 
|
1288  | 
        >>> os.path.samefile(orig.base, clone.base)
 | 
|
1289  | 
        False
 | 
|
1290  | 
        >>> os.path.isfile(os.path.join(clone.base, "file1"))
 | 
|
1291  | 
        True
 | 
|
1292  | 
        """
 | 
|
| 
800
by Martin Pool
 Merge John's import-speedup branch:  | 
1293  | 
from shutil import copytree  | 
1294  | 
from tempfile import mkdtemp  | 
|
1295  | 
base = mkdtemp()  | 
|
| 
622
by Martin Pool
 Updated merge patch from Aaron  | 
1296  | 
os.rmdir(base)  | 
| 
800
by Martin Pool
 Merge John's import-speedup branch:  | 
1297  | 
copytree(self.base, base, symlinks=True)  | 
| 
622
by Martin Pool
 Updated merge patch from Aaron  | 
1298  | 
return ScratchBranch(base=base)  | 
1299  | 
||
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
1300  | 
def __del__(self):  | 
| 
396
by Martin Pool
 - Using the destructor on a ScratchBranch is not reliable;  | 
1301  | 
self.destroy()  | 
1302  | 
||
1303  | 
def destroy(self):  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
1304  | 
"""Destroy the test branch, removing the scratch directory."""  | 
| 
800
by Martin Pool
 Merge John's import-speedup branch:  | 
1305  | 
from shutil import rmtree  | 
| 
163
by mbp at sourcefrog
 merge win32 portability fixes  | 
1306  | 
try:  | 
| 
610
by Martin Pool
 - replace Branch.lock(mode) with separate lock_read and lock_write  | 
1307  | 
if self.base:  | 
1308  | 
mutter("delete ScratchBranch %s" % self.base)  | 
|
| 
800
by Martin Pool
 Merge John's import-speedup branch:  | 
1309  | 
rmtree(self.base)  | 
| 
396
by Martin Pool
 - Using the destructor on a ScratchBranch is not reliable;  | 
1310  | 
except OSError, e:  | 
| 
163
by mbp at sourcefrog
 merge win32 portability fixes  | 
1311  | 
            # Work around for shutil.rmtree failing on Windows when
 | 
1312  | 
            # readonly files are encountered
 | 
|
| 
396
by Martin Pool
 - Using the destructor on a ScratchBranch is not reliable;  | 
1313  | 
mutter("hit exception in destroying ScratchBranch: %s" % e)  | 
| 
163
by mbp at sourcefrog
 merge win32 portability fixes  | 
1314  | 
for root, dirs, files in os.walk(self.base, topdown=False):  | 
1315  | 
for name in files:  | 
|
1316  | 
os.chmod(os.path.join(root, name), 0700)  | 
|
| 
800
by Martin Pool
 Merge John's import-speedup branch:  | 
1317  | 
rmtree(self.base)  | 
| 
396
by Martin Pool
 - Using the destructor on a ScratchBranch is not reliable;  | 
1318  | 
self.base = None  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
1319  | 
|
1320  | 
||
1321  | 
||
1322  | 
######################################################################
 | 
|
1323  | 
# predicates
 | 
|
1324  | 
||
1325  | 
||
1326  | 
def is_control_file(filename):  | 
|
1327  | 
    ## FIXME: better check
 | 
|
1328  | 
filename = os.path.normpath(filename)  | 
|
1329  | 
while filename != '':  | 
|
1330  | 
head, tail = os.path.split(filename)  | 
|
1331  | 
        ## mutter('check %r for control file' % ((head, tail), ))
 | 
|
1332  | 
if tail == bzrlib.BZRDIR:  | 
|
1333  | 
return True  | 
|
| 
70
by mbp at sourcefrog
 Prepare for smart recursive add.  | 
1334  | 
if filename == head:  | 
1335  | 
            break
 | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
1336  | 
filename = head  | 
1337  | 
return False  | 
|
1338  | 
||
1339  | 
||
1340  | 
||
| 
70
by mbp at sourcefrog
 Prepare for smart recursive add.  | 
1341  | 
def gen_file_id(name):  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
1342  | 
"""Return new file id.  | 
1343  | 
||
1344  | 
    This should probably generate proper UUIDs, but for the moment we
 | 
|
1345  | 
    cope with just randomness because running uuidgen every time is
 | 
|
1346  | 
    slow."""
 | 
|
| 
535
by Martin Pool
 - try to eliminate wierd characters from file names when they're  | 
1347  | 
import re  | 
| 
800
by Martin Pool
 Merge John's import-speedup branch:  | 
1348  | 
from binascii import hexlify  | 
1349  | 
from time import time  | 
|
| 
535
by Martin Pool
 - try to eliminate wierd characters from file names when they're  | 
1350  | 
|
1351  | 
    # get last component
 | 
|
| 
70
by mbp at sourcefrog
 Prepare for smart recursive add.  | 
1352  | 
idx = name.rfind('/')  | 
1353  | 
if idx != -1:  | 
|
1354  | 
name = name[idx+1 : ]  | 
|
| 
262
by Martin Pool
 - gen_file_id: break the file on either / or \ when looking  | 
1355  | 
idx = name.rfind('\\')  | 
1356  | 
if idx != -1:  | 
|
1357  | 
name = name[idx+1 : ]  | 
|
| 
70
by mbp at sourcefrog
 Prepare for smart recursive add.  | 
1358  | 
|
| 
535
by Martin Pool
 - try to eliminate wierd characters from file names when they're  | 
1359  | 
    # make it not a hidden file
 | 
| 
70
by mbp at sourcefrog
 Prepare for smart recursive add.  | 
1360  | 
name = name.lstrip('.')  | 
1361  | 
||
| 
535
by Martin Pool
 - try to eliminate wierd characters from file names when they're  | 
1362  | 
    # remove any wierd characters; we don't escape them but rather
 | 
1363  | 
    # just pull them out
 | 
|
1364  | 
name = re.sub(r'[^\w.]', '', name)  | 
|
1365  | 
||
| 
190
by mbp at sourcefrog
 64 bits of randomness in file/revision ids  | 
1366  | 
s = hexlify(rand_bytes(8))  | 
| 
800
by Martin Pool
 Merge John's import-speedup branch:  | 
1367  | 
return '-'.join((name, compact_date(time()), s))  | 
| 
909
by Martin Pool
 - merge John's code to give the tree root an explicit file id  | 
1368  | 
|
1369  | 
||
1370  | 
def gen_root_id():  | 
|
1371  | 
"""Return a new tree-root file id."""  | 
|
1372  | 
return gen_file_id('TREE_ROOT')  | 
|
1373  |