From 56af60ceaf4a6111e2f1862e4dc35d4ebc1d38eb Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 24 Jul 2011 17:03:32 -0400
Subject: [PATCH] Arguments

- Converted from Arguments to A3.
---
 src/commands/CmdMerge.cpp | 4 ++--
 src/commands/CmdPull.cpp  | 4 ++--
 src/commands/CmdPush.cpp  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/commands/CmdMerge.cpp b/src/commands/CmdMerge.cpp
index 80e4b359b..9f2a0fa03 100644
--- a/src/commands/CmdMerge.cpp
+++ b/src/commands/CmdMerge.cpp
@@ -49,10 +49,10 @@ CmdMerge::CmdMerge ()
 ////////////////////////////////////////////////////////////////////////////////
 int CmdMerge::execute (std::string& output)
 {
-  Arguments words = context.args.extract_simple_words ();
+  std::vector <std::string> words = context.a3.extract_words ();
   std::string file;
   if (words.size ())
-    file = words[0]._first;
+    file = words[0];
 
   std::string pushfile = "";
   std::string tmpfile = "";
diff --git a/src/commands/CmdPull.cpp b/src/commands/CmdPull.cpp
index b1cdb8471..d24cb6a60 100644
--- a/src/commands/CmdPull.cpp
+++ b/src/commands/CmdPull.cpp
@@ -48,10 +48,10 @@ CmdPull::CmdPull ()
 ////////////////////////////////////////////////////////////////////////////////
 int CmdPull::execute (std::string& output)
 {
-  Arguments words = context.args.extract_simple_words ();
+  std::vector <std::string> words = context.a3.extract_words ();
   std::string file;
   if (words.size ())
-    file = words[0]._first;
+    file = words[0];
 
   Uri uri (file, "pull");
   uri.parse ();
diff --git a/src/commands/CmdPush.cpp b/src/commands/CmdPush.cpp
index f8c3fb2c6..394344d06 100644
--- a/src/commands/CmdPush.cpp
+++ b/src/commands/CmdPush.cpp
@@ -50,10 +50,10 @@ CmdPush::CmdPush ()
 // this is potentially on another machine, no checking can be performed.
 int CmdPush::execute (std::string& output)
 {
-  Arguments words = context.args.extract_simple_words ();
+  std::vector <std::string> words = context.a3.extract_words ();
   std::string file;
   if (words.size ())
-    file = words[0]._first;
+    file = words[0];
 
   Uri uri (file, "push");
   uri.parse ();