|
392.1.1
by Aaron Bentley
Implement 'shove' for moving changes to other trees |
1 |
# Copyright (C) 2006 Aaron Bentley
|
2 |
# <aaron.bentley@utoronto.ca>
|
|
3 |
#
|
|
4 |
# This program is free software; you can redistribute it and/or modify
|
|
5 |
# it under the terms of the GNU General Public License as published by
|
|
6 |
# the Free Software Foundation; either version 2 of the License, or
|
|
7 |
# (at your option) any later version.
|
|
8 |
#
|
|
9 |
# This program is distributed in the hope that it will be useful,
|
|
10 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
11 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
12 |
# GNU General Public License for more details.
|
|
13 |
#
|
|
14 |
# You should have received a copy of the GNU General Public License
|
|
15 |
# along with this program; if not, write to the Free Software
|
|
16 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
17 |
||
18 |
||
19 |
import os |
|
20 |
||
21 |
from bzrlib.errors import NoSuchFile |
|
22 |
from bzrlib.workingtree import WorkingTree |
|
23 |
from bzrlib.merge import merge_inner |
|
24 |
||
25 |
def do_shove(source, target): |
|
26 |
if not os.path.exists(source): |
|
27 |
raise NoSuchFile(source) |
|
28 |
if not os.path.exists(target): |
|
29 |
raise NoSuchFile(target) |
|
30 |
source_tree = WorkingTree.open_containing(source)[0] |
|
31 |
target_tree = WorkingTree.open_containing(target)[0] |
|
32 |
merge_inner(target_tree.branch, source_tree, source_tree.basis_tree(), |
|
33 |
this_tree=target_tree) |