Rev 8: Merge in the changes from Scott Scriven in http://bzr.arbash-meinel.com/plugins/merge_into

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/plugins/merge_into

------------------------------------------------------------
revno: 8
revision-id: john at arbash-meinel.com-20080828014116-bpboik3vp8tqv7x7
parent: john at arbash-meinel.com-20080821155111-qi179m9m2brnzsuj
parent: ubuntu at toykeeper.net-20080726200158-lbt0zm50hv7hefhr
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: merge_into
timestamp: Wed 2008-08-27 20:41:16 -0500
message:
  Merge in the changes from Scott Scriven
modified:
  __init__.py                    __init__.py-20070131211431-n3aub0cnlzpa49ww-1
  merge_into.py                  merge_into.py-20070131214328-dide73mgytkt6kk2-1
    ------------------------------------------------------------
    revno: 6.1.3
    revision-id: ubuntu at toykeeper.net-20080726200158-lbt0zm50hv7hefhr
    parent: ubuntu at toykeeper.net-20080726200032-oe23ccl25tgs3dpo
    committer: Scott Scriven <ubuntu at toykeeper.net>
    branch nick: fix-paths-from-root
    timestamp: Sat 2008-07-26 14:01:58 -0600
    message:
      added context and missing newline to result messages
    modified:
      __init__.py                    __init__.py-20070131211431-n3aub0cnlzpa49ww-1
    ------------------------------------------------------------
    revno: 6.1.2
    revision-id: ubuntu at toykeeper.net-20080726200032-oe23ccl25tgs3dpo
    parent: ubuntu at toykeeper.net-20080726195536-gdsg1plkyc2018q6
    committer: Scott Scriven <ubuntu at toykeeper.net>
    branch nick: fix-paths-from-root
    timestamp: Sat 2008-07-26 14:00:32 -0600
    message:
      made subdir relative to current directory, not repo root
    modified:
      merge_into.py                  merge_into.py-20070131214328-dide73mgytkt6kk2-1
    ------------------------------------------------------------
    revno: 6.1.1
    revision-id: ubuntu at toykeeper.net-20080726195536-gdsg1plkyc2018q6
    parent: john at arbash-meinel.com-20080721181435-clttbrdmno1bmmkq
    committer: Scott Scriven <ubuntu at toykeeper.net>
    branch nick: fix-paths-from-root
    timestamp: Sat 2008-07-26 13:55:36 -0600
    message:
      made subdir parameter optional
    modified:
      __init__.py                    __init__.py-20070131211431-n3aub0cnlzpa49ww-1
-------------- next part --------------
=== modified file '__init__.py'
--- a/__init__.py	2008-07-21 18:14:35 +0000
+++ b/__init__.py	2008-07-26 20:01:58 +0000
@@ -30,21 +30,25 @@
 
     LOCATION is the branch that will be merged into this one.
     SUBDIR is the subdirectory that will be used for merging.
+      (defaults to basename of LOCATION)
 
     After running 'bzr merge OTHER SUBDIR' all of the files from OTHER will be
     present underneath the subdirectory SUBDIR.
     """
 
-    takes_args = ['location', 'subdir']
+    takes_args = ['location', 'subdir?']
     takes_options = []
 
-    def run(self, location=None, subdir=None):
+    def run(self, location, subdir=None):
+        if not subdir: # default to same name as source dir
+            import os
+            subdir = os.path.basename(location)
         import merge_into
         conflicts = merge_into.merge_into_helper(location, subdir)
         if not conflicts:
-            self.outf.write('successful')
+            self.outf.write('merge-into successful\n')
         else:
-            self.outf.write('conflicts: %s' % (conflicts,))
+            self.outf.write('merge-into conflicts: %s\n' % (conflicts,))
             return 1
 
 

=== modified file 'merge_into.py'
--- a/merge_into.py	2008-08-21 15:51:11 +0000
+++ b/merge_into.py	2008-08-28 01:41:16 +0000
@@ -151,7 +151,9 @@
 
 def merge_into_helper(location, subdir, this_location='.'):
     """Handle the command line functionality, etc."""
-    wt, relpath = workingtree.WorkingTree.open_containing(this_location)
+    import os
+    wt, subdir_relpath = workingtree.WorkingTree.open_containing(
+                        osutils.pathjoin(this_location, subdir))
     branch_to_merge = branch.Branch.open(location)
 
     wt.lock_write()
@@ -160,7 +162,6 @@
         # 'subdir' is given relative to 'this_location', convert it back into a
         # path relative to wt.basedir. This also normalizes the path, so things
         # like '.' and '..' are removed.
-        subdir_relpath = wt.relpath(osutils.pathjoin(this_location, subdir))
         target_tree = branch_to_merge.basis_tree()
         target_tree.lock_read()
         try: