diff options
| author | Sam Steingold | 2009-09-22 18:43:45 +0000 |
|---|---|---|
| committer | Sam Steingold | 2009-09-22 18:43:45 +0000 |
| commit | 8dd110b4c35f64c6fa50b7910f5f18ed0dacc3d3 (patch) | |
| tree | a54efcd87703a1406cc6d39b70e710d2dcebb62d | |
| parent | 72169e55e34c84dbd3931990f4ba5e0914cbac57 (diff) | |
| download | emacs-8dd110b4c35f64c6fa50b7910f5f18ed0dacc3d3.tar.gz emacs-8dd110b4c35f64c6fa50b7910f5f18ed0dacc3d3.zip | |
(vc-hg-outgoing, vc-hg-incoming): Ignore errors from
`vc-hg-command' because hg returns status 1 when nothing is found.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/vc-hg.el | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index dfb3d544456..cebb444e380 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,6 +1,8 @@ | |||
| 1 | 2009-09-22 Sam Steingold <sds@gnu.org> | 1 | 2009-09-22 Sam Steingold <sds@gnu.org> |
| 2 | 2 | ||
| 3 | * vc-hg.el (vc-hg-print-log): Fix shortlog arg passing. | 3 | * vc-hg.el (vc-hg-print-log): Fix shortlog arg passing. |
| 4 | (vc-hg-outgoing, vc-hg-incoming): Ignore errors from | ||
| 5 | `vc-hg-command' because hg returns status 1 when nothing is found. | ||
| 4 | 6 | ||
| 5 | 2009-09-22 Stefan Monnier <monnier@iro.umontreal.ca> | 7 | 2009-09-22 Stefan Monnier <monnier@iro.umontreal.ca> |
| 6 | 8 | ||
diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el index 597d807e7e7..80f130bd565 100644 --- a/lisp/vc-hg.el +++ b/lisp/vc-hg.el | |||
| @@ -570,14 +570,14 @@ REV is the revision to check out into WORKFILE." | |||
| 570 | (defun vc-hg-outgoing () | 570 | (defun vc-hg-outgoing () |
| 571 | (interactive) | 571 | (interactive) |
| 572 | (let ((bname "*Hg outgoing*")) | 572 | (let ((bname "*Hg outgoing*")) |
| 573 | (vc-hg-command bname 0 nil "outgoing" "-n") | 573 | (ignore-errors (vc-hg-command bname 0 nil "outgoing" "-n")) |
| 574 | (pop-to-buffer bname) | 574 | (pop-to-buffer bname) |
| 575 | (vc-hg-outgoing-mode))) | 575 | (vc-hg-outgoing-mode))) |
| 576 | 576 | ||
| 577 | (defun vc-hg-incoming () | 577 | (defun vc-hg-incoming () |
| 578 | (interactive) | 578 | (interactive) |
| 579 | (let ((bname "*Hg incoming*")) | 579 | (let ((bname "*Hg incoming*")) |
| 580 | (vc-hg-command bname 0 nil "incoming" "-n") | 580 | (ignore-errors (vc-hg-command bname 0 nil "incoming" "-n")) |
| 581 | (pop-to-buffer bname) | 581 | (pop-to-buffer bname) |
| 582 | (vc-hg-incoming-mode))) | 582 | (vc-hg-incoming-mode))) |
| 583 | 583 | ||