--- a/contrib/bash_completion Tue Aug 07 10:01:20 2007 +0200
+++ b/contrib/bash_completion Tue Aug 07 10:28:14 2007 +0200
@@ -28,7 +28,7 @@
# cat ~/.patchbomb-$1
# fi
# }
-#
+#
#
# Writing completion functions for additional commands:
#
@@ -50,7 +50,7 @@
# an argument (e.g. '--cwd|-R|--repository')
# - $canonical - 1 if we canonicalized $cmd before calling the function
# 0 otherwise
-#
+#
shopt -s extglob
@@ -425,7 +425,7 @@
done
if [ -z "$subcmd" ] || [ $COMP_CWORD -eq $i ] || [ "$subcmd" = help ]; then
- COMPREPLY=(${COMPREPLY[@]:-}
+ COMPREPLY=(${COMPREPLY[@]:-}
$(compgen -W 'bad good help init next reset' -- "$cur"))
return
fi
@@ -445,7 +445,7 @@
{
case "$prev" in
-c|--cc|-t|--to|-f|--from|--bcc)
- # we need an e-mail address. let the user provide a function
+ # we need an e-mail address. let the user provide a function
# to get them
if [ "$(type -t _hg_emails)" = function ]; then
local arg=to
--- a/contrib/hgdiff Tue Aug 07 10:01:20 2007 +0200
+++ b/contrib/hgdiff Tue Aug 07 10:28:14 2007 +0200
@@ -15,7 +15,7 @@
parser.add_option('-x', '--count', default=1)
parser.add_option('-c', '--context', type="int", default=3)
parser.add_option('-p', '--show-c-function', action="store_true", default=False)
-parser.add_option('-w', '--ignore-all-space', action="store_true",
+parser.add_option('-w', '--ignore-all-space', action="store_true",
default=False)
(options, args) = parser.parse_args()
--- a/contrib/hgsh/hgsh.c Tue Aug 07 10:01:20 2007 +0200
+++ b/contrib/hgsh/hgsh.c Tue Aug 07 10:28:14 2007 +0200
@@ -249,7 +249,7 @@
hg_serve,
};
-
+
/*
* attempt to verify that a directory is really a hg repo, by testing
* for the existence of a subdirectory.
@@ -342,13 +342,13 @@
if (cmd != hg_init) {
int valid;
-
+
valid = validate_repo(repo_root, "data");
if (valid == -1) {
goto badargs;
}
-
+
if (valid == 0) {
valid = validate_repo(repo_root, "store");
@@ -356,7 +356,7 @@
goto badargs;
}
}
-
+
if (valid == 0) {
perror(repo);
exit(EX_DATAERR);
@@ -385,7 +385,7 @@
nargv[i++] = repo;
break;
}
-
+
nargv[i] = NULL;
if (debug) {
--- a/contrib/mercurial.el Tue Aug 07 10:01:20 2007 +0200
+++ b/contrib/mercurial.el Tue Aug 07 10:28:14 2007 +0200
@@ -426,7 +426,7 @@
(if (or (not default) current-prefix-arg)
(string-to-number
(eval (list* 'read-string
- (or prompt "")
+ (or prompt "")
(if default (cons (format "%d" default) nil) nil))))
default)))
@@ -565,7 +565,7 @@
(when buf
(set-buffer buf)
(hg-mode-line-internal status parents)))))))
-
+
;;; View mode bits.
@@ -588,7 +588,7 @@
(setq hg-view-mode t)
(setq truncate-lines t)
(when file-name
- (setq hg-view-file-name
+ (setq hg-view-file-name
(hg-abbrev-file-name file-name))))
(defun hg-file-status (file)
@@ -703,7 +703,7 @@
(added . "a")
(deleted . "!")
(modified . "m"))))))))
-
+
(defun hg-mode-line (&optional force)
"Update the modeline with the current status of a file.
An update occurs if optional argument FORCE is non-nil,
@@ -1000,7 +1000,7 @@
;; none revision is specified explicitly
(none (and (not rev1) (not rev2)))
;; only one revision is specified explicitly
- (one (or (and (or (equal rev1 rev2) (not rev2)) rev1)
+ (one (or (and (or (equal rev1 rev2) (not rev2)) rev1)
(and (not rev1) rev2)))
diff)
(hg-view-output ((cond
@@ -1012,7 +1012,7 @@
(format "Mercurial: Diff from rev %s to %s of %s"
rev1 rev2 a-path))))
(cond
- (none
+ (none
(call-process (hg-binary) nil t nil "diff" path))
(one
(call-process (hg-binary) nil t nil "diff" "-r" one path))
@@ -1100,7 +1100,7 @@
(limit (format "%d" (or log-limit hg-log-limit))))
(hg-view-output ((if (equal r1 r2)
(format "Mercurial: Log of rev %s of %s" rev1 a-path)
- (format
+ (format
"Mercurial: at most %s log(s) from rev %s to %s of %s"
limit r1 r2 a-path)))
(eval (list* 'call-process (hg-binary) nil t nil
@@ -1123,7 +1123,7 @@
(interactive (list (hg-read-file-name " to log")
(hg-read-rev " to start with"
"tip")
- (hg-read-rev " to end with"
+ (hg-read-rev " to end with"
"0")
(hg-read-number "Output limited to: "
hg-log-limit)))
--- a/contrib/mq.el Tue Aug 07 10:01:20 2007 +0200
+++ b/contrib/mq.el Tue Aug 07 10:28:14 2007 +0200
@@ -131,7 +131,7 @@
(let ((line (buffer-substring bol (point))))
(when (> (length line) 0)
line))))
-
+
(defun mq-push (&optional patch)
"Push patches until PATCH is reached.
If PATCH is nil, push at most one patch."
@@ -166,7 +166,7 @@
(if ok
(message "Pushing... %s" last-line)
(error "Pushing... %s" last-line)))))
-
+
(defun mq-push-all ()
"Push patches until all are applied."
(interactive)
@@ -195,7 +195,7 @@
(if ok
(message "Popping... %s" last-line)
(error "Popping... %s" last-line)))))
-
+
(defun mq-pop-all ()
"Push patches until none are applied."
(interactive)
@@ -255,7 +255,7 @@
(let ((buf mq-prev-buffer))
(kill-buffer nil)
(switch-to-buffer buf)))
-
+
(defun mq-edit-kill ()
"Kill the edit currently being prepared."
(interactive)
@@ -316,7 +316,7 @@
(set-buffer-modified-p nil)
(setq buffer-undo-list nil)
(run-hooks 'text-mode-hook 'mq-edit-mode-hook))
-
+
(defun mq-refresh-edit ()
"Refresh the topmost applied patch, editing the patch description."
(interactive)
--- a/contrib/simplemerge Tue Aug 07 10:01:20 2007 +0200
+++ b/contrib/simplemerge Tue Aug 07 10:28:14 2007 +0200
@@ -28,7 +28,7 @@
class CantReprocessAndShowBase(Exception):
pass
-
+
def warn(message):
sys.stdout.flush()
@@ -50,7 +50,7 @@
"""
assert ra[0] <= ra[1]
assert rb[0] <= rb[1]
-
+
sa = max(ra[0], rb[0])
sb = min(ra[1], rb[1])
if sa < sb:
@@ -69,7 +69,7 @@
return False
else:
return True
-
+
@@ -149,15 +149,15 @@
yield end_marker + newline
else:
raise ValueError(what)
-
-
+
+
def merge_annotated(self):
"""Return merge with conflicts, showing origin of lines.
- Most useful for debugging merge.
+ Most useful for debugging merge.
"""
for t in self.merge_regions():
what = t[0]
@@ -180,8 +180,8 @@
yield '>>>>\n'
else:
raise ValueError(what)
-
-
+
+
@@ -249,15 +249,15 @@
# section a[0:ia] has been disposed of, etc
iz = ia = ib = 0
-
+
for zmatch, zend, amatch, aend, bmatch, bend in self.find_sync_regions():
#print 'match base [%d:%d]' % (zmatch, zend)
-
+
matchlen = zend - zmatch
assert matchlen >= 0
assert matchlen == (aend - amatch)
assert matchlen == (bend - bmatch)
-
+
len_a = amatch - ia
len_b = bmatch - ib
len_base = zmatch - iz
@@ -294,22 +294,22 @@
# if the same part of the base was deleted on both sides
# that's OK, we can just skip it.
-
+
if matchlen > 0:
assert ia == amatch
assert ib == bmatch
assert iz == zmatch
-
+
yield 'unchanged', zmatch, zend
iz = zend
ia = aend
ib = bend
-
+
def reprocess_merge_regions(self, merge_regions):
"""Where there are conflict regions, remove the agreed lines.
- Lines where both A and B have made the same changes are
+ Lines where both A and B have made the same changes are
eliminated.
"""
for region in merge_regions:
@@ -342,7 +342,7 @@
if next_a < region_ia or next_b < region_ib:
return 'conflict', None, None, next_a, region_ia, next_b, region_ib
mismatch_region = staticmethod(mismatch_region)
-
+
def find_sync_regions(self):
"""Return a list of sync regions, where both descendents match the base.
@@ -397,7 +397,7 @@
ia += 1
else:
ib += 1
-
+
intbase = len(self.base)
abase = len(self.a)
bbase = len(self.b)
@@ -429,7 +429,7 @@
del am[0]
else:
del bm[0]
-
+
return unc
@@ -511,9 +511,9 @@
usage = _('''simplemerge [OPTS] LOCAL BASE OTHER
Simple three-way file merge utility with a minimal feature set.
-
+
Apply to LOCAL the changes necessary to go from BASE to OTHER.
-
+
By default, LOCAL is overwritten with the results of this operation.
''')
--- a/contrib/vim/hg-menu.vim Tue Aug 07 10:01:20 2007 +0200
+++ b/contrib/vim/hg-menu.vim Tue Aug 07 10:28:14 2007 +0200
@@ -9,7 +9,7 @@
" Usage: These command and gui menu displays useful hg functions
" Configuration: Your hg executable must be in your path.
" =============================================================================
-
+
" Section: Init {{{1
if exists("loaded_hg_menu")
finish
--- a/contrib/win32/ReadMe.html Tue Aug 07 10:01:20 2007 +0200
+++ b/contrib/win32/ReadMe.html Tue Aug 07 10:28:14 2007 +0200
@@ -2,7 +2,7 @@
<html>
<head>
<title>Mercurial for Windows</title>
- <meta http-equiv="Content-Type" content="text/html;charset=utf-8" >
+ <meta http-equiv="Content-Type" content="text/html;charset=utf-8" >
<style type="text/css">
<!--
.indented
@@ -21,7 +21,7 @@
<p>Mercurial is a command-line application. You must run it from
the Windows command prompt (or if you're hard core, a <a
href="http://www.mingw.org/">MinGW</a> shell).</p>
-
+
<p><div class="indented"><i>Note: the standard <a
href="http://www.mingw.org/">MinGW</a> msys startup script uses
rxvt which has problems setting up standard input and output.
@@ -59,10 +59,10 @@
</pre>
<h4>Configuring a Merge program</h4>
- It should be emphasized that Mercurial by itself doesn't attempt to do a
+ It should be emphasized that Mercurial by itself doesn't attempt to do a
Merge at the file level, neither does it make any attempt to Resolve the conflicts.
- By default, Mercurial will use the merge program defined by the HGMERGE environment
+ By default, Mercurial will use the merge program defined by the HGMERGE environment
variable, or uses the one defined in the mercurial.ini file. (see <a href="http://www.selenic.com/mercurial/wiki/index.cgi/MergeProgram">MergeProgram</a> on the Mercurial Wiki for more information)
<h1>Reporting problems</h1>
--- a/contrib/win32/mercurial.ini Tue Aug 07 10:01:20 2007 +0200
+++ b/contrib/win32/mercurial.ini Tue Aug 07 10:28:14 2007 +0200
@@ -3,7 +3,7 @@
; USERNAME is your Windows user name:
; C:\Documents and Settings\USERNAME\Mercurial.ini
-[ui]
+[ui]
editor = notepad
; By default, we try to encode and decode all files that do not
--- a/contrib/win32/win32-build.txt Tue Aug 07 10:01:20 2007 +0200
+++ b/contrib/win32/win32-build.txt Tue Aug 07 10:28:14 2007 +0200
@@ -35,7 +35,7 @@
In a shell, build a standalone copy of the hg.exe program:
- python setup.py build -c mingw32
+ python setup.py build -c mingw32
python setup.py py2exe -b 1
Note: the previously suggested combined command of "python setup.py build -c
--- a/doc/hgrc.5.txt Tue Aug 07 10:01:20 2007 +0200
+++ b/doc/hgrc.5.txt Tue Aug 07 10:28:14 2007 +0200
@@ -137,17 +137,17 @@
**.txt = tempfile: unix2dos -n INFILE OUTFILE
defaults::
- Use the [defaults] section to define command defaults, i.e. the
+ Use the [defaults] section to define command defaults, i.e. the
default options/arguments to pass to the specified commands.
-
+
The following example makes 'hg log' run in verbose mode, and
'hg status' show only the modified files, by default.
-
+
[defaults]
log = -v
status = -m
-
- The actual commands, instead of their aliases, must be used when
+
+ The actual commands, instead of their aliases, must be used when
defining command defaults. The command defaults will also be
applied to the aliases of the commands defined.
--- a/doc/ja/docbook.ja.conf Tue Aug 07 10:01:20 2007 +0200
+++ b/doc/ja/docbook.ja.conf Tue Aug 07 10:28:14 2007 +0200
@@ -481,7 +481,7 @@
</book>
[preamble]
-# Preamble is not allowed in DocBook book so wrap it in a preface.
+# Preamble is not allowed in DocBook book so wrap it in a preface.
<preface{id? id="{id}"}>
<title>Preface</title>
|
--- a/doc/ja/hg.1.ja.txt Tue Aug 07 10:01:20 2007 +0200
+++ b/doc/ja/hg.1.ja.txt Tue Aug 07 10:28:14 2007 +0200
@@ -219,7 +219,7 @@
-f, --force 既存の変更されたファイルに無理矢理コピー
します
-p, --parents コピー先にコピー元のパスを追加します
-
+
別名: cp
diff [-a] [-r revision] [-r revision] [files ...]::
@@ -388,7 +388,7 @@
オプション:
- -0, --print0 xargs と一緒に使うために、ファイル名を
+ -0, --print0 xargs と一緒に使うために、ファイル名を
NUL で終えます
-f, --fullpath ファイルシステムのルートからの完全なパ
スを表示します
@@ -580,9 +580,9 @@
-E, --errorlog <file> エラーログが出力されるファイルの名前を
指定します
-a, --address <addr> 使用するアドレスを指定します
- -p, --port <n> 使用するポートを指定します
+ -p, --port <n> 使用するポートを指定します
(デフォルト: 8000)
- -n, --name <name> ウェブページで表示する名前を指定します
+ -n, --name <name> ウェブページで表示する名前を指定します
(デフォルト: working dir)
-t, --templatedir <path> 使用するウェブの雛型を指定します
-6, --ipv6 IPv4 に加えて IPv6 も使用します
--- a/doc/ja/hgrc.5.ja.txt Tue Aug 07 10:01:20 2007 +0200
+++ b/doc/ja/hgrc.5.ja.txt Tue Aug 07 10:28:14 2007 +0200
@@ -61,7 +61,7 @@
クションのそれぞれの目的や可能なキー、そして取り得る値について記述
します。
-decode/encode::
+decode/encode::
checkout/checkin でファイルを転送するときのフィルターです。これ
は典型的には改行を処理したり、他の地域化/標準化に使われるでしょ
う。
@@ -98,7 +98,7 @@
HTTP プロキシを通してウェブを使った Mercurial のリポジトリにアク
セスするのに使われます。
host;;
- プロキシサーバのホスト名と(オプションの)ポートで、例えば
+ プロキシサーバのホスト名と(オプションの)ポートで、例えば
"myproxy:8000"などです。
no;;
オプションです。コンマで区切られたプロキシを通過すべきホスト名
--- a/tests/hghave Tue Aug 07 10:01:20 2007 +0200
+++ b/tests/hghave Tue Aug 07 10:28:14 2007 +0200
@@ -55,7 +55,7 @@
if options.list_features:
list_features()
sys.exit(0)
-
+
quiet = options.quiet
failures = 0
@@ -65,17 +65,17 @@
if not quiet:
sys.stderr.write(msg + '\n')
failures += 1
-
+
for feature in args:
if feature not in checks:
error('hghave: unknown feature: ' + feature)
continue
-
- check, desc = checks[feature]
+
+ check, desc = checks[feature]
if not check():
error('hghave: missing feature: ' + desc)
if failures != 0:
sys.exit(1)
-
+
--- a/tests/run-tests.py Tue Aug 07 10:01:20 2007 +0200
+++ b/tests/run-tests.py Tue Aug 07 10:28:14 2007 +0200
@@ -322,7 +322,7 @@
elif diffret:
ret = diffret
- if ret != 0 and not skipped:
+ if ret != 0 and not skipped:
# Save errors to a file for diagnosis
f = open(err, "wb")
for line in out:
Binary file tests/test-simplemerge-cmd.out has changed