# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Date 1126722456 25200
# Node ID 2534b41ce0c5dd05759bf676efa1732bd6df4268
# Parent  7a70dafbf4b9fa230d8a1387665f2008f4fb0463# Parent  ae96c85fb0af71b55b0411ef66c111ab5e561898
Merge with myself.



diff -r 7a70dafbf4b9 -r 2534b41ce0c5 contrib/mercurial.el
--- a/contrib/mercurial.el	Wed Sep 14 10:50:03 2005 -0700
+++ b/contrib/mercurial.el	Wed Sep 14 11:27:36 2005 -0700
@@ -993,9 +993,16 @@
 		  (or repo hg-outgoing-repository))
     (hg-log-mode)))
 
-(defun hg-pull ()
-  (interactive)
-  (error "not implemented"))
+(defun hg-pull (&optional repo)
+  "Pull changes from repository REPO.
+This does not update the working directory."
+  (interactive (list (hg-read-repo-name " to pull from")))
+  (hg-view-output ((format "Mercurial: Pull to %s from %s"
+			   (hg-abbrev-file-name (hg-root))
+			   (hg-abbrev-file-name
+			    (or repo hg-incoming-repository))))
+    (call-process (hg-binary) nil t nil "pull"
+		  (or repo hg-incoming-repository))))
 
 (defun hg-push (&optional repo)
   "Push changes to repository REPO."
@@ -1079,6 +1086,10 @@
   (interactive)
   (error "not implemented"))
 
+(defun hg-update ()
+  (interactive)
+  (error "not implemented"))
+
 (defun hg-version-other-window ()
   (interactive)
   (error "not implemented"))