Mercurial > hg
changeset 1248:2534b41ce0c5
Merge with myself.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Wed, 14 Sep 2005 11:27:36 -0700 |
parents | 7a70dafbf4b9 (current diff) ae96c85fb0af (diff) |
children | a5355fa5e33a |
files | |
diffstat | 1 files changed, 14 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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"))