branch: externals/vc-hgcmd commit 086e05dd5c9b1082e5b3df4060c282c1c7eb3243 Author: muffinmad <andreyk....@gmail.com> Commit: muffinmad <andreyk....@gmail.com>
fixed more typos --- README.md | 8 ++++---- vc-hgcmd.el | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 696728d..0a98578 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Also you can use `vc-find-conflicted-file` to find next file with unresolved mer #### hg summary as `vc-dir` extra headers -`hg cummary` command gives useful information about commit, update and phase states. +`hg summary` command gives useful information about commit, update and phase states. #### Current branch is displayed on mode line. @@ -46,7 +46,7 @@ By default it's `--update`. You can change it for particular pull by invoking `v Instead of list of all revisions of file `vc-hgcmd` provides list of named branches and tags. It's very useful on `vc-retrieve-tag`. -You can specify `-C` to run `hg update` with `-C` flag and discard all uncommited changes. +You can specify `-C` to run `hg update` with `-C` flag and discard all uncommitted changes. #### Filenames in `vc-annotate` buffer are hidden @@ -60,7 +60,7 @@ If `vc-create-tag` is invoked with prefix argument then named branch will be cre #### Predefined commit message -While commiting merge changes commit message will be set to `merged <branch>` if +While committing merge changes commit message will be set to `merged <branch>` if different branch was merged or to `merged <node>`. ## Installation @@ -69,4 +69,4 @@ Download `vc-hgcmd.el` and run: <kbd>M-x</kbd> `package-install-file` <kbd>RET</kbd> `<path-to-vc-hgcmd-el>` <kbd>RET</kbd> -Also you need to add `Hgcmd` to `vc-handled-backeds` before or instead `Hg`. +Also you need to add `Hgcmd` to `vc-handled-backends` before or instead `Hg`. diff --git a/vc-hgcmd.el b/vc-hgcmd.el index cad9bf8..f6407e7 100644 --- a/vc-hgcmd.el +++ b/vc-hgcmd.el @@ -40,7 +40,7 @@ ;; Also you can use `vc-find-conflicted-file' to find next file with unresolved merge conflict. ;; ;; - hg summary as `vc-dir' extra headers -;; hg cummary command gives useful information about commit, update and phase states. +;; hg summary command gives useful information about commit, update and phase states. ;; ;; - Current branch is displayed on mode line. ;; It's not customizable yet. @@ -58,7 +58,7 @@ ;; - Branches and tags as revision completion table ;; Instead of list of all revisions of file vc-hgcmd provides list of named branches and tags. ;; It's very useful on `vc-retrieve-tag'. -;; You can specify -C to run hg update with -C flag and discard all uncommited changes. +;; You can specify -C to run hg update with -C flag and discard all uncommitted changes. ;; ;; - Filenames in vc-annotate buffer are hidden ;; They are needed to annotate changes across renames but mostly useless in annotate buffer. @@ -69,7 +69,7 @@ ;; If `vc-create-tag' is invoked with prefix argument then named branch will be created. ;; ;; - Predefined commit message -;; While commiting merge changes commit message will be set to 'merged <branch>' if +;; While committing merge changes commit message will be set to 'merged <branch>' if ;; different branch was merged or to 'merged <node>' ;;; Code: @@ -453,7 +453,7 @@ Insert 'Running command' and display buffer text if COMMAND" ;; TODO status-fileinfo-extra (defun vc-hgcmd-working-revision (file) - "Working revision. Return repository working revision if FILE is commited." + "Working revision. Return repository working revision if FILE is committed." (if (and file (eq 'added (vc-state file))) "0" (or (vc-hgcmd-command "log" "-l" "1" "-f" "-T" "{rev}") "0"))) @@ -735,7 +735,7 @@ Insert 'Running command' and display buffer text if COMMAND" (declare-function log-edit-mode "log-edit" ()) (defun vc-hgcmd--set-log-edit-summary () - "Set summary of commit message to 'merged ...' if commiting after merge." + "Set summary of commit message to 'merged ...' if committing after merge." (let* ((parents (split-string (vc-hgcmd-command "log" "-r" "p1()+p2()" "--template" "{node}\\0{branch}\n") "\n")) (p1 (car parents)) (p2 (cadr parents)))