[PATCH 2/2] notmuch-dev: Update the master branch when requested.

2012-01-16 Thread Xavier Maillard 
On Mon, 16 Jan 2012 09:07:52 +, David Edmondson  wrote:
> On Fri, 13 Jan 2012 22:03:17 +0100, Xavier Maillard  
> wrote:
> > Have you planned to cook something about this in notmuch wiki ?
> > That sounds like something I could use to test patches more easily than
> > I do currently.
> 
> I'll do so.

If I can help, just tell :D

/Xavier

[PATCH 2/2] notmuch-dev: Update the master branch when requested.

2012-01-16 Thread David Edmondson 
On Fri, 13 Jan 2012 22:03:17 +0100, Xavier Maillard  
wrote:
> Have you planned to cook something about this in notmuch wiki ?
> That sounds like something I could use to test patches more easily than
> I do currently.

I'll do so.

> Note: I am totally a dummy when I have to use git :/

Me too, hence the wrapper!
-- next part --
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL:

Re: [PATCH 2/2] notmuch-dev: Update the master branch when requested.

2012-01-16 Thread David Edmondson 
On Fri, 13 Jan 2012 22:03:17 +0100, Xavier Maillard xav...@maillard.im wrote:
 Have you planned to cook something about this in notmuch wiki ?
 That sounds like something I could use to test patches more easily than
 I do currently.

I'll do so.

 Note: I am totally a dummy when I have to use git :/

Me too, hence the wrapper!


pgpnpGZxejUN5.pgp
Description: PGP signature
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch

Re: [PATCH 2/2] notmuch-dev: Update the master branch when requested.

2012-01-16 Thread Xavier Maillard 
On Mon, 16 Jan 2012 09:07:52 +, David Edmondson d...@dme.org wrote:
 On Fri, 13 Jan 2012 22:03:17 +0100, Xavier Maillard xav...@maillard.im 
 wrote:
  Have you planned to cook something about this in notmuch wiki ?
  That sounds like something I could use to test patches more easily than
  I do currently.
 
 I'll do so.

If I can help, just tell :D

/Xavier
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch

[PATCH 2/2] notmuch-dev: Update the master branch when requested.

2012-01-13 Thread Xavier Maillard 
Hi David,

Have you planned to cook something about this in notmuch wiki ?
That sounds like something I could use to test patches more easily than
I do currently.

Note: I am totally a dummy when I have to use git :/

Regards

/Xavier

[PATCH 2/2] notmuch-dev: Update the master branch when requested.

2012-01-13 Thread David Edmondson 
If `notmuch-dev-show-review-patch' is called with a prefix argument,
pull updates for the 'master' branch of the temporary repository.
---
 emacs/notmuch-dev.el |8 +++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/emacs/notmuch-dev.el b/emacs/notmuch-dev.el
index 465846f..3a15bf4 100644
--- a/emacs/notmuch-dev.el
+++ b/emacs/notmuch-dev.el
@@ -61,7 +61,12 @@
   (error "git clone failed."

 (defun notmuch-dev-checkout-master ()
-  (magit-checkout "master"))
+  (magit-checkout "master")
+  (when current-prefix-arg
+(message "Updating master...")
+;; Don't use `magit-pull' because it runs asynchronously.
+(magit-run-git "pull" "-v")
+(message "Updating master...done.")))

 (defun notmuch-dev-delete-branch (name)
   ;; `magit-delete-branch' uses "-d", which is not sufficiently
@@ -108,6 +113,7 @@
 (let ((default-directory notmuch-dev-temporary-repository-path))

   (notmuch-dev-checkout-master)
+
   ;; Delete the branch if it exists.
   (condition-case nil
  (notmuch-dev-delete-branch patch-name)
-- 
1.7.7.3

[PATCH 2/2] notmuch-dev: Update the master branch when requested.

2012-01-13 Thread David Edmondson 
If `notmuch-dev-show-review-patch' is called with a prefix argument,
pull updates for the 'master' branch of the temporary repository.
---
 emacs/notmuch-dev.el |8 +++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/emacs/notmuch-dev.el b/emacs/notmuch-dev.el
index 465846f..3a15bf4 100644
--- a/emacs/notmuch-dev.el
+++ b/emacs/notmuch-dev.el
@@ -61,7 +61,12 @@
   (error git clone failed.
 
 (defun notmuch-dev-checkout-master ()
-  (magit-checkout master))
+  (magit-checkout master)
+  (when current-prefix-arg
+(message Updating master...)
+;; Don't use `magit-pull' because it runs asynchronously.
+(magit-run-git pull -v)
+(message Updating master...done.)))
 
 (defun notmuch-dev-delete-branch (name)
   ;; `magit-delete-branch' uses -d, which is not sufficiently
@@ -108,6 +113,7 @@
 (let ((default-directory notmuch-dev-temporary-repository-path))
 
   (notmuch-dev-checkout-master)
+
   ;; Delete the branch if it exists.
   (condition-case nil
  (notmuch-dev-delete-branch patch-name)
-- 
1.7.7.3

___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch