Mercurial > hg > mercurial-crew-with-dirclash
comparison contrib/mq.el @ 4426:807c7b99ff13
imported patch mq-refresh-git.patch
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Tue, 08 May 2007 11:54:39 -0700 |
parents | a57ac6049e22 |
children | b59611e9dd64 |
comparison
equal
deleted
inserted
replaced
4425:a57ac6049e22 | 4426:807c7b99ff13 |
---|---|
195 (let ((ret (apply 'hg-run "qrefresh" args))) | 195 (let ((ret (apply 'hg-run "qrefresh" args))) |
196 (if (equal (car ret) 0) | 196 (if (equal (car ret) 0) |
197 (message "Refreshing %s... done." patch) | 197 (message "Refreshing %s... done." patch) |
198 (error "Refreshing %s... %s" patch (hg-chomp (cdr ret))))))) | 198 (error "Refreshing %s... %s" patch (hg-chomp (cdr ret))))))) |
199 | 199 |
200 (defun mq-refresh () | 200 (defun mq-refresh (&optional git) |
201 "Refresh the topmost applied patch." | 201 "Refresh the topmost applied patch. |
202 (interactive) | 202 With a prefix argument, generate a git-compatible patch." |
203 (interactive "P") | |
203 (let ((root (hg-root))) | 204 (let ((root (hg-root))) |
204 (unless root | 205 (unless root |
205 (error "Cannot refresh outside of a repository!")) | 206 (error "Cannot refresh outside of a repository!")) |
206 (mq-refresh-internal root))) | 207 (apply 'mq-refresh-internal root (if git '("--git"))))) |
207 | 208 |
208 (defun mq-patch-info (cmd &optional msg) | 209 (defun mq-patch-info (cmd &optional msg) |
209 (let* ((ret (hg-run cmd)) | 210 (let* ((ret (hg-run cmd)) |
210 (info (hg-chomp (cdr ret)))) | 211 (info (hg-chomp (cdr ret)))) |
211 (if (equal (car ret) 0) | 212 (if (equal (car ret) 0) |