Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
c0203c86
Commit
c0203c86
authored
Nov 24, 2008
by
Dan Nicolaescu
Browse files
(vc-hg-global-switches): Remove.
(vc-hg-state, vc-hg-working-revision, vc-hg-command): Undo previous change.
parent
a2baab5c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
13 deletions
+11
-13
lisp/ChangeLog
lisp/ChangeLog
+6
-0
lisp/vc-hg.el
lisp/vc-hg.el
+5
-13
No files found.
lisp/ChangeLog
View file @
c0203c86
2008-11-24 Dan Nicolaescu <dann@ics.uci.edu>
* vc-hg.el (vc-hg-global-switches): Remove.
(vc-hg-state, vc-hg-working-revision, vc-hg-command): Undo
previous change.
2008-11-23 Martin Rudalics <rudalics@gmx.at>
* info-look.el (info-lookup): When Info buffer is visible on
...
...
lisp/vc-hg.el
View file @
c0203c86
...
...
@@ -116,12 +116,6 @@
;;; Customization options
(
defcustom
vc-hg-program
"hg"
"Name of the Hg executable."
:type
'string
:version
"23.1"
:group
'vc
)
(
defcustom
vc-hg-global-switches
nil
"*Global switches to pass to any Hg command."
:type
'
(
choice
(
const
:tag
"None"
nil
)
...
...
@@ -180,8 +174,7 @@ If you want to force an empty list of arguments, use t."
(
condition-case
nil
;; Ignore all errors.
(
call-process
vc-hg-program
nil
t
nil
"--cwd"
(
file-name-directory
file
)
"hg"
nil
t
nil
"--cwd"
(
file-name-directory
file
)
"status"
"-A"
(
file-name-nondirectory
file
))
;; Some problem happened. E.g. We can't find an `hg'
;; executable.
...
...
@@ -212,8 +205,7 @@ If you want to force an empty list of arguments, use t."
(
condition-case
nil
;; Ignore all errors.
(
call-process
vc-hg-program
nil
t
nil
"--cwd"
(
file-name-directory
file
)
"hg"
nil
t
nil
"--cwd"
(
file-name-directory
file
)
"log"
"-l1"
(
file-name-nondirectory
file
))
;; Some problem happened. E.g. We can't find an `hg'
;; executable.
...
...
@@ -605,9 +597,9 @@ REV is the revision to check out into WORKFILE."
(
defun
vc-hg-command
(
buffer
okstatus
file-or-list
&rest
flags
)
"A wrapper around `vc-do-command' for use in vc-hg.el.
The difference to vc-do-command is that this function always invokes
`vc-hg-program',
and that it passes `vc-hg-global-switches' to it before FLAGS."
(
apply
'vc-do-command
(
or
buffer
"*vc*"
)
okstatus
vc-hg-program
file-or-list
The difference to vc-do-command is that this function always invokes
`hg',
and that it passes `vc-hg-global-switches' to it before FLAGS."
(
apply
'vc-do-command
(
or
buffer
"*vc*"
)
okstatus
"hg"
file-or-list
(
if
(
stringp
vc-hg-global-switches
)
(
cons
vc-hg-global-switches
flags
)
(
append
vc-hg-global-switches
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment