← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to bzr-pull

  • Committer: Aaron Bentley
  • Date: 2005-05-10 07:44:49 UTC
  • Revision ID: abentley@bruiser-20050510074449-e777ba7207947e05
made ancestry-iteration use the right version

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzr-pull
15
15
# You should have received a copy of the GNU General Public License
16
16
# along with this program; if not, write to the Free Software
17
17
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
18
import bzrlib
18
19
from bzrlib import Branch
 
20
from bzrlib.diff import diff_trees
19
21
import sys
20
22
import os
21
 
import bzrtools
22
 
import optparse
 
23
import scriptlib
23
24
 
24
25
cur_branch = Branch(".")
25
 
parser = optparse.OptionParser("bzr-pull [URL]")
26
 
parser.add_option("-o", "--overwrite", action="store_true", 
27
 
                                  dest="overwrite",
28
 
                                  help="Overwrite any local changes")
29
 
options, args = parser.parse_args(sys.argv[1:])
30
 
if len(args) > 0:
31
 
    location = args[0]
 
26
if len(sys.argv) > 1:
 
27
    location = sys.argv[1]
32
28
else:
33
29
    location = None
34
 
bzrtools.pull(cur_branch, location, options.overwrite)
 
30
scriptlib.pull(cur_branch, location)
35
31