upstream/mercurial-mirror Commit - r1697:7b4128f6

Merge with crew

Matt Mackall -

r1697:7b4128f6 default

parent child

contrib/macosx/Readme.html

0 created 644 +38 0

@@ -0,0 +1,38 b''
	1	<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
	2	<html>
	3	<head>
	4	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
	5	<meta http-equiv="Content-Style-Type" content="text/css">
	6	<title></title>
	7	<style type="text/css">
	8	p.p1 {margin: 0.0px 0.0px 0.0px 0.0px; font: 14.0px Helvetica}
	9	p.p2 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica; min-height: 14.0px}
	10	p.p3 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica}
	11	p.p4 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica; color: #000fed}
	12	span.s1 {text-decoration: underline}
	13	span.s2 {font: 12.0px Courier}
	14	</style>
	15	</head>
	16	<body>
	17	<p class="p1"><b>Before you install</b></p>
	18	<p class="p2"><br></p>
	19	<p class="p3">This is <i>not</i> a stand-alone version of Mercurial.</p>
	20	<p class="p2"><br></p>
	21	<p class="p3">To use it, you must have the “official unofficial” MacPython 2.4.1 installed.</p>
	22	<p class="p2"><br></p>
	23	<p class="p3">You can download MacPython 2.4.1 from here:</p>
	24	<p class="p4"><span class="s1"><a href="http://python.org/ftp/python/2.4.1/MacPython-OSX-2.4.1-1.dmg">http://python.org/ftp/python/2.4.1/MacPython-OSX-2.4.1-1.dmg</a></span></p>
	25	<p class="p2"><br></p>
	26	<p class="p3">For more information on MacPython, go here:</p>
	27	<p class="p4"><span class="s1"><a href="http://undefined.org/python/">http://undefined.org/python</a></span></p>
	28	<p class="p2"><br></p>
	29	<p class="p1"><b>After you install</b></p>
	30	<p class="p2"><br></p>
	31	<p class="p3">This package installs the <span class="s2">hg</span> executable in <span class="s2">/usr/local/bin</span>. This directory may not be in your shell's search path. Don't forget to check.</p>
	32	<p class="p2"><br></p>
	33	<p class="p1"><b>Reporting problems</b></p>
	34	<p class="p2"><br></p>
	35	<p class="p3">If you run into any problems, please file a bug online:</p>
	36	<p class="p3"><a href="http://www.selenic.com/mercurial/bts">http://www.selenic.com/mercurial/bts</a></p>
	37	</body>
	38	</html>

contrib/macosx/Welcome.html

0 created 644 +17 0

@@ -0,0 +1,17 b''
	1	<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
	2	<html>
	3	<head>
	4	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
	5	<meta http-equiv="Content-Style-Type" content="text/css">
	6	<title></title>
	7	<style type="text/css">
	8	p.p1 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica}
	9	p.p2 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica; min-height: 14.0px}
	10	</style>
	11	</head>
	12	<body>
	13	<p class="p1">This is a prepackaged release of <a href="http://www.selenic.com/mercurial">Mercurial</a> for Mac OS X.</p>
	14	<p class="p2"><br></p>
	15	<p class="p1">It is based on Mercurial 0.8.</p>
	16	</body>
	17	</html>

contrib/macosx/macosx-build.txt

0 created 644 +11 0

@@ -0,0 +1,11 b''
	1	to build a new macosx binary package:
	2
	3	install macpython from http://undefined.org/python/
	4
	5	install py2app from http://pythonmac.org/packages/
	6
	7	make sure /usr/local/bin is in your path
	8
	9	run bdist_mpkg in top-level hg directory
	10
	11	find packaged stuff in dist directory

templates/fileannotate-raw.tmpl

0 created 644 +5 0

@@ -0,0 +1,5 b''
	1	#header#
	2	#annotate%annotateline#
	3	#footer#
	4
	5

contrib/bash_completion

0 +40 -39

             _hg_command_list()
             {
-                hg --debug help 2>/dev/null | \
+                "$hg" --debug help 2>/dev/null | \
             	awk 'function command_line(line) {
-            		 gsub(/,/, "", line)
+            		gsub(/,/, "", line)
-            		 gsub(/:.*/, "", line)
+            		gsub(/:.*/, "", line)
-            		 split(line, aliases)
+            		split(line, aliases)
-            		 command = aliases[1]
+            		command = aliases[1]
-            		 delete aliases[1]
+            		delete aliases[1]
-            		 print command
+            		print command
-            		 for (i in aliases)
+            		for (i in aliases)
-            		     if (index(command, aliases[i]) != 1)
+            		    if (index(command, aliases[i]) != 1)
-            			 print aliases[i]
+            			print aliases[i]
+            	    }
-            	     /^list of commands:/ {commands=1}
+            	    /^list of commands:/ {commands=1}
-            	     commands && /^ debug/ {a[i++] = $0; next;}
+            	    commands && /^ debug/ {a[i++] = $0; next;}
-            	     commands && /^ [^ ]/ {command_line($0)}
+            	    commands && /^ [^ ]/ {command_line($0)}
-            	     /^global options:/ {exit 0}
+            	    /^global options:/ {exit 0}
-            	     END {for (i in a) command_line(a[i])}'
+            	    END {for (i in a) command_line(a[i])}'
             }
             _hg_option_list()
             {
-                hg -v help $1 2> /dev/null | \
+                "$hg" -v help $1 2>/dev/null | \
-                    awk '/^ *-/ {
+            	awk '/^ *-/ {
-            		 for (i = 1; i <= NF; i ++) {
+            		for (i = 1; i <= NF; i ++) {
             		    if (index($i, "-") != 1)
-            			 break;
+            			break;
             		    print $i;
+            		}
-            	     }'
+            	    }'
             }
             _hg_paths()
             {
-                local paths="$(hg paths 2> /dev/null | sed -e 's/ = .*$//')"
+                local paths="$("$hg" paths 2>/dev/null | sed -e 's/ = .*$//')"
-                COMPREPLY=(${COMPREPLY[@]:-} $( compgen -W '$paths' -- "$cur" ))
+                COMPREPLY=(${COMPREPLY[@]:-} $(compgen -W '$paths' -- "$cur"))
             }
             _hg_repos()
             {
                 local i
-                for i in $( compgen -d -- "$cur" ); do
+                for i in $(compgen -d -- "$cur"); do
-                    test ! -d "$i"/.hg || COMPREPLY=(${COMPREPLY[@]:-} "$i")
+            	test ! -d "$i"/.hg || COMPREPLY=(${COMPREPLY[@]:-} "$i")
                 done
             }
             _hg_status()
             {
-                local files="$( hg status -n$1 . 2> /dev/null)"
+                local files="$("$hg" status -n$1 . 2>/dev/null)"
-                COMPREPLY=(${COMPREPLY[@]:-} $( compgen -W '$files' -- "$cur" ))
+                COMPREPLY=(${COMPREPLY[@]:-} $(compgen -W '$files' -- "$cur"))
             }
             _hg_tags()
             {
-                local tags="$(hg tags 2> /dev/null |
+                local tags="$("$hg" tags 2>/dev/null |
-                                  sed -e 's/[0-9]*:[a-f0-9]\{40\}$//; s/ *$//')"
+            	sed -e 's/[0-9]*:[a-f0-9]\{40\}$//; s/ *$//')"
-                COMPREPLY=( ${COMPREPLY[@]:-} $(compgen -W '$tags' -- "$cur") )
+                COMPREPLY=(${COMPREPLY[@]:-} $(compgen -W '$tags' -- "$cur"))
             }
             # this is "kind of" ugly...
                 local i count=0
                 local filters="$1"
-                for (( i=1; $i<=$COMP_CWORD; i++ )); do
+                for ((i=1; $i<=$COMP_CWORD; i++)); do
             	if [[ "${COMP_WORDS[i]}" != -* ]]; then
             	    if [[ ${COMP_WORDS[i-1]} == @($filters|$global_args) ]]; then
             		continue
                 local cur prev cmd opts i
                 # global options that receive an argument
                 local global_args='--cwd|-R|--repository'
+                local hg="$1"
                 COMPREPLY=()
                 cur="$2"
                 # searching for the command
                 # (first non-option argument that doesn't follow a global option that
                 #  receives an argument)
-                for (( i=1; $i<=$COMP_CWORD; i++ )); do
+                for ((i=1; $i<=$COMP_CWORD; i++)); do
             	if [[ ${COMP_WORDS[i]} != -* ]]; then
             	    if [[ ${COMP_WORDS[i-1]} != @($global_args) ]]; then
             		cmd="${COMP_WORDS[i]}"
                 if [[ "$cur" == -* ]]; then
             	opts=$(_hg_option_list $cmd)
-            	COMPREPLY=( ${COMPREPLY[@]:-} $(compgen -W '$opts' -- "$cur") )
+            	COMPREPLY=(${COMPREPLY[@]:-} $(compgen -W '$opts' -- "$cur"))
             	return
                 fi
                 fi
                 # canonicalize command name
-                cmd=$(hg -q help "$cmd" 2> /dev/null | sed -e 's/^hg //; s/ .*//; 1q')
+                cmd=$("$hg" -q help "$cmd" 2>/dev/null | sed -e 's/^hg //; s/ .*//; 1q')
                 if [ "$cmd" != status ] && [ "$prev" = -r ] || [ "$prev" = --rev ]; then
             	_hg_tags
             	    if [ $count = 1 ]; then
             		_hg_paths
             	    fi
-                        _hg_repos
+            	    _hg_repos
             	;;
             	debugindex|debugindexdot)
-            	    COMPREPLY=(${COMPREPLY[@]:-} $( compgen -f -X "!*.i" -- "$cur" ))
+            	    COMPREPLY=(${COMPREPLY[@]:-} $(compgen -f -X "!*.i" -- "$cur"))
             	;;
             	debugdata)
-            	    COMPREPLY=(${COMPREPLY[@]:-} $( compgen -f -X "!*.d" -- "$cur" ))
+            	    COMPREPLY=(${COMPREPLY[@]:-} $(compgen -f -X "!*.d" -- "$cur"))
             	;;
                 esac
             }
-            complete -o bashdefault -o default -F _hg hg 2> /dev/null \
+            complete -o bashdefault -o default -F _hg hg 2>/dev/null \
                 || complete -o default -F _hg hg

contrib/win32/ReadMe.html

0 +1 -1

               </head>
               <body>
-                <h1>Mercurial version 0.7 for Windows</h1>
+                <h1>Mercurial version 0.8 for Windows</h1>
                 <p>Welcome to Mercurial for Windows!</p>

contrib/win32/mercurial.iss

0 +3 -3

             [Setup]
             AppCopyright=Copyright 2005 Matt Mackall and others
             AppName=Mercurial
-            AppVerName=Mercurial version 0.7
+            AppVerName=Mercurial version 0.8
             InfoAfterFile=contrib/win32/postinstall.txt
             LicenseFile=COPYING
             ShowLanguageDialog=yes
             AppUpdatesURL=http://www.selenic.com/mercurial
             AppID={{4B95A5F1-EF59-4B08-BED8-C891C46121B3}
             AppContact=mercurial@selenic.com
-            OutputBaseFilename=Mercurial-0.7
+            OutputBaseFilename=Mercurial-0.8
             DefaultDirName={sd}\Mercurial
             SourceDir=C:\hg\hg-release
-            VersionInfoVersion=0.7
+            VersionInfoVersion=0.8
             VersionInfoDescription=Mercurial distributed SCM
             VersionInfoCopyright=Copyright 2005 Matt Mackall and others
             VersionInfoCompany=Matt Mackall and others

contrib/win32/postinstall.txt

0 +21 0

@@ -8,6 +8,27 b' file that comes with this package.'
8	Release Notes	8	Release Notes
9	-------------	9	-------------
10		10
		11	2006-01-29 v0.8
		12
		13	* Upgrade notes:
		14
		15	- diff and status command are now repo-wide by default
		16	(use 'hg diff .' for the old behavior)
		17	- GPG signing is now done with the gpg extension
		18	- the --text option for commit, rawcommit, and tag has been removed
		19	- the copy/rename --parents option has been removed
		20
		21	* Major changes from 0.7 to 0.8:
		22
		23	- faster status, diff, and commit
		24	- reduced memory usage for push and pull
		25	- improved extension API
		26	- new bisect, gpg, hgk, and win32text extensions
		27	- short URLs, binary file handling, and optional gitweb skin for hgweb
		28	- numerous new command options including log --keyword and pull --rev
		29	- improved hooks and file filtering
		30
		31
11	2005-09-21 v0.7 with modifications	32	2005-09-21 v0.7 with modifications
12		33
13	* New INI files have been added to control Mercurial's behaviour:	34	* New INI files have been added to control Mercurial's behaviour:

doc/Makefile

0 +1 -1

             	asciidoc -d manpage -b docbook $*.txt
             %.html: %.txt
-            	asciidoc -b html4 $*.txt
+            	asciidoc -b html4 $*.txt || asciidoc -b html $*.txt
             clean:
             	$(RM) $(MAN) $(MAN:%=%.xml) $(MAN:%=%.html)

hgext/gpg.py

0 +133 -70

@@ -1,6 +1,14 b''
1	import os, tempfile, binascii, errno	1	# GnuPG signing extension for Mercurial
		2	#
		3	# Copyright 2005, 2006 Benoit Boissinot <benoit.boissinot@ens-lyon.org>
		4	#
		5	# This software may be used and distributed according to the terms
		6	# of the GNU General Public License, incorporated herein by reference.
		7
		8	import os, tempfile, binascii
2	from mercurial import util	9	from mercurial import util
3	from mercurial import node as hgnode	10	from mercurial import node as hgnode
		11	from mercurial.i18n import gettext as _
4		12
5	class gpg:	13	class gpg:
6	def __init__(self, path, key=None):	14	def __init__(self, path, key=None):
@@ -14,6 +22,7 b' class gpg:'
14	def verify(self, data, sig):	22	def verify(self, data, sig):
15	""" returns of the good and bad signatures"""	23	""" returns of the good and bad signatures"""
16	try:	24	try:
		25	# create temporary files
17	fd, sigfile = tempfile.mkstemp(prefix="hggpgsig")	26	fd, sigfile = tempfile.mkstemp(prefix="hggpgsig")
18	fp = os.fdopen(fd, 'wb')	27	fp = os.fdopen(fd, 'wb')
19	fp.write(sig)	28	fp.write(sig)
@@ -22,8 +31,8 b' class gpg:'
22	fp = os.fdopen(fd, 'wb')	31	fp = os.fdopen(fd, 'wb')
23	fp.write(data)	32	fp.write(data)
24	fp.close()	33	fp.close()
25	gpgcmd = "%s --logger-fd 1 --status-fd 1 --verify \"%s\" \"%s\"" % (~~self~~.~~path~~, ~~sigfile~~, ~~datafile~~)	34	gpgcmd = ("%s --logger-fd 1 --status-fd 1 --verify "
26	~~#gpgcmd = "%s --status-fd 1 --verify~~ \"%s\" \"%s\"" % (self.path, sigfile, datafile)	35	"\"%s\" \"%s\"" % (self.path, sigfile, datafile))
27	ret = util.filter("", gpgcmd)	36	ret = util.filter("", gpgcmd)
28	except:	37	except:
29	for f in (sigfile, datafile):	38	for f in (sigfile, datafile):
@@ -41,7 +50,7 b' class gpg:'
41	continue	50	continue
42	l = l[9:]	51	l = l[9:]
43	if l.startswith("ERRSIG"):	52	if l.startswith("ERRSIG"):
44	err = "error while verifying signature"	53	err = _("error while verifying signature")
45	break	54	break
46	elif l.startswith("VALIDSIG"):	55	elif l.startswith("VALIDSIG"):
47	# fingerprint of the primary key	56	# fingerprint of the primary key
@@ -61,12 +70,97 b' class gpg:'
61	return err, keys	70	return err, keys
62		71
63	def newgpg(ui, **opts):	72	def newgpg(ui, **opts):
		73	"""create a new gpg instance"""
64	gpgpath = ui.config("gpg", "cmd", "gpg")	74	gpgpath = ui.config("gpg", "cmd", "gpg")
65	gpgkey = opts.get('key')	75	gpgkey = opts.get('key')
66	if not gpgkey:	76	if not gpgkey:
67	gpgkey = ui.config("gpg", "key", None)	77	gpgkey = ui.config("gpg", "key", None)
68	return gpg(gpgpath, gpgkey)	78	return gpg(gpgpath, gpgkey)
69		79
		80	def sigwalk(repo):
		81	"""
		82	walk over every sigs, yields a couple
		83	((node, version, sig), (filename, linenumber))
		84	"""
		85	def parsefile(fileiter, context):
		86	ln = 1
		87	for l in fileiter:
		88	if not l:
		89	continue
		90	yield (l.split(" ", 2), (context, ln))
		91	ln +=1
		92
		93	fl = repo.file(".hgsigs")
		94	h = fl.heads()
		95	h.reverse()
		96	# read the heads
		97	for r in h:
		98	fn = ".hgsigs\|%s" % hgnode.short(r)
		99	for item in parsefile(fl.read(r).splitlines(), fn):
		100	yield item
		101	try:
		102	# read local signatures
		103	fn = "localsigs"
		104	for item in parsefile(repo.opener(fn), fn):
		105	yield item
		106	except IOError:
		107	pass
		108
		109	def getkeys(ui, repo, mygpg, sigdata, context):
		110	"""get the keys who signed a data"""
		111	fn, ln = context
		112	node, version, sig = sigdata
		113	prefix = "%s:%d" % (fn, ln)
		114	node = hgnode.bin(node)
		115
		116	data = node2txt(repo, node, version)
		117	sig = binascii.a2b_base64(sig)
		118	err, keys = mygpg.verify(data, sig)
		119	if err:
		120	ui.warn("%s:%d %s\n" % (fn, ln , err))
		121	return None
		122
		123	validkeys = []
		124	# warn for expired key and/or sigs
		125	for key in keys:
		126	if key[0] == "BADSIG":
		127	ui.write(_("%s Bad signature from \"%s\"\n") % (prefix, key[2]))
		128	continue
		129	if key[0] == "EXPSIG":
		130	ui.write(_("%s Note: Signature has expired"
		131	" (signed by: \"%s\")\n") % (prefix, key[2]))
		132	elif key[0] == "EXPKEYSIG":
		133	ui.write(_("%s Note: This key has expired"
		134	" (signed by: \"%s\")\n") % (prefix, key[2]))
		135	validkeys.append((key[1], key[2], key[3]))
		136	return validkeys
		137
		138	def sigs(ui, repo):
		139	"""list signed changesets"""
		140	mygpg = newgpg(ui)
		141	revs = {}
		142
		143	for data, context in sigwalk(repo):
		144	node, version, sig = data
		145	fn, ln = context
		146	try:
		147	n = repo.lookup(node)
		148	except KeyError:
		149	ui.warn(_("%s:%d node does not exist\n") % (fn, ln))
		150	continue
		151	r = repo.changelog.rev(n)
		152	keys = getkeys(ui, repo, mygpg, data, context)
		153	if not keys:
		154	continue
		155	revs.setdefault(r, [])
		156	revs[r].extend(keys)
		157	nodes = list(revs)
		158	nodes.reverse()
		159	for rev in nodes:
		160	for k in revs[rev]:
		161	r = "%5d:%s" % (rev, hgnode.hex(repo.changelog.node(rev)))
		162	ui.write("%-30s %s\n" % (keystr(ui, k), r))
		163
70	def check(ui, repo, rev):	164	def check(ui, repo, rev):
71	"""verify all the signatures there may be for a particular revision"""	165	"""verify all the signatures there may be for a particular revision"""
72	mygpg = newgpg(ui)	166	mygpg = newgpg(ui)
@@ -74,63 +168,30 b' def check(ui, repo, rev):'
74	hexrev = hgnode.hex(rev)	168	hexrev = hgnode.hex(rev)
75	keys = []	169	keys = []
76		170
77	def addsig(fn, ln, l):	171	for data, context in sigwalk(repo):
78	if not l: return	172	node, version, sig = data
79	n, v, sig = l.split(" ", 2)	173	if node == hexrev:
80	if n == hexrev:	174	k = getkeys(ui, repo, mygpg, data, context)
81	data = node2txt(repo, rev, v)	175	if k:
82	sig = binascii.a2b_base64(sig)	176	keys.extend(k)
83	err, k = mygpg.verify(data, sig)
84	if not err:
85	keys.append((k, fn, ln))
86	else:
87	ui.warn("%s:%d %s\n" % (fn, ln , err))
88
89	fl = repo.file(".hgsigs")
90	h = fl.heads()
91	h.reverse()
92	# read the heads
93	for r in h:
94	ln = 1
95	for l in fl.read(r).splitlines():
96	addsig(".hgsigs\|%s" % hgnode.short(r), ln, l)
97	ln +=1
98	try:
99	# read local signatures
100	ln = 1
101	f = repo.opener("localsigs")
102	for l in f:
103	addsig("localsigs", ln, l)
104	ln +=1
105	except IOError:
106	pass
107		177
108	if not keys:	178	if not keys:
109	ui.write("%s ~~not signed~~\n" % hgnode.short(rev))	179	ui.write(_("No valid signature for %s\n") % hgnode.short(rev))
110	return	180	return
111	valid = []	181
112	# warn for expired key and/or sigs
113	for k, fn, ln in keys:
114	prefix = "%s:%d" % (fn, ln)
115	for key in k:
116	if key[0] == "BADSIG":
117	ui.write("%s Bad signature from \"%s\"\n" % (prefix, key[2]))
118	continue
119	if key[0] == "EXPSIG":
120	ui.write("%s Note: Signature has expired"
121	" (signed by: \"%s\")\n" % (prefix, key[2]))
122	elif key[0] == "EXPKEYSIG":
123	ui.write("%s Note: This key has expired"
124	" (signed by: \"%s\")\n" % (prefix, key[2]))
125	valid.append((key[1], key[2], key[3]))
126	# print summary	182	# print summary
127	ui.write("%s is signed by:\n" % hgnode.short(rev))	183	ui.write("%s is signed by:\n" % hgnode.short(rev))
128	for keyid, user, fingerprint in valid:	184	for key in keys:
129	role = getrole(ui, fingerprint)	185	ui.write(" %s\n" % keystr(ui, key))
130	ui.write(" %s (%s)\n" % (user, role))
131		186
132	def ~~getrole~~(ui, ~~fingerprint~~):	187	def keystr(ui, key):
133	return ui.config("gpg", fingerprint, "no role defined")	188	"""associate a string to a key (username, comment)"""
		189	keyid, user, fingerprint = key
		190	comment = ui.config("gpg", fingerprint, None)
		191	if comment:
		192	return "%s (%s)" % (user, comment)
		193	else:
		194	return user
134		195
135	def sign(ui, repo, revs, *opts):	196	def sign(ui, repo, revs, *opts):
136	"""add a signature for the current tip or a given revision"""	197	"""add a signature for the current tip or a given revision"""
@@ -150,7 +211,7 b' def sign(ui, repo, revs, *opts):'
150	data = node2txt(repo, n, sigver)	211	data = node2txt(repo, n, sigver)
151	sig = mygpg.sign(data)	212	sig = mygpg.sign(data)
152	if not sig:	213	if not sig:
153	raise util.Abort("Error while signing")	214	raise util.Abort(_("Error while signing"))
154	sig = binascii.b2a_base64(sig)	215	sig = binascii.b2a_base64(sig)
155	sig = sig.replace("\n", "")	216	sig = sig.replace("\n", "")
156	sigmessage += "%s %s %s\n" % (hexnode, sigver, sig)	217	sigmessage += "%s %s %s\n" % (hexnode, sigver, sig)
@@ -162,9 +223,9 b' def sign(ui, repo, revs, *opts):'
162		223
163	for x in repo.changes():	224	for x in repo.changes():
164	if ".hgsigs" in x and not opts["force"]:	225	if ".hgsigs" in x and not opts["force"]:
165	raise util.Abort("working copy of .hgsigs is changed "	226	raise util.Abort(_("working copy of .hgsigs is changed "
166	"(please commit .hgsigs manually"	227	"(please commit .hgsigs manually "
167	"or use --force)")	228	"or use --force)"))
168		229
169	repo.wfile(".hgsigs", "ab").write(sigmessage)	230	repo.wfile(".hgsigs", "ab").write(sigmessage)
170		231
@@ -176,7 +237,8 b' def sign(ui, repo, revs, *opts):'
176		237
177	message = opts['message']	238	message = opts['message']
178	if not message:	239	if not message:
179	message = "\n".join(["Added signature for changeset %s" % ~~hgnode~~.~~hex~~(n)	240	message = "\n".join([_("Added signature for changeset %s")
		241	% hgnode.hex(n)
180	for n in nodes])	242	for n in nodes])
181	try:	243	try:
182	repo.commit([".hgsigs"], message, opts['user'], opts['date'])	244	repo.commit([".hgsigs"], message, opts['user'], opts['date'])
@@ -188,19 +250,20 b' def node2txt(repo, node, ver):'
188	if ver == "0":	250	if ver == "0":
189	return "%s\n" % hgnode.hex(node)	251	return "%s\n" % hgnode.hex(node)
190	else:	252	else:
191	util.Abort("unknown signature version")	253	raise util.Abort(_("unknown signature version"))
192		254
193	cmdtable = {	255	cmdtable = {
194	"sign":	256	"sign":
195	(sign,	257	(sign,
196	[('l', 'local', None, "make the signature local"),	258	[('l', 'local', None, _("make the signature local")),
197	('f', 'force', None, "sign even if the sigfile is modified"),	259	('f', 'force', None, _("sign even if the sigfile is modified")),
198	('', 'no-commit', None, "do not commit the sigfile after signing"),	260	('', 'no-commit', None, _("do not commit the sigfile after signing")),
199	('m', 'message', "", "commit message"),	261	('m', 'message', "", _("commit message")),
200	('d', 'date', "", "date code"),	262	('d', 'date', "", _("date code")),
201	('u', 'user', "", "user"),	263	('u', 'user', "", _("user")),
202	('k', 'key', "", "the key id to sign with")],	264	('k', 'key', "", _("the key id to sign with"))],
203	"hg sign [OPTION]... REVISIONS"),	265	_("hg sign [OPTION]... [REVISION]...")),
204	"sigcheck": (check, [], 'hg sigcheck REVISION')	266	"sigcheck": (check, [], _('hg sigcheck REVISION')),
		267	"sigs": (sigs, [], _('hg sigs')),
205	}	268	}
206		269

hgext/patchbomb.py ~~contrib/patchbomb~~

0 renamed 755 ➡ 644 +33 -34

-            #!/usr/bin/python
+            # Command for sending a collection of Mercurial changesets as a series
+            # of patch emails.
-            # Interactive script for sending a collection of Mercurial changesets
-            # as a series of patch emails.
             #
             # The series is started off with a "[PATCH 0 of N]" introduction,
             # which describes the series as a whole.
             from email.MIMEMultipart import MIMEMultipart
             from email.MIMEText import MIMEText
             from mercurial import commands
-            from mercurial import fancyopts
             from mercurial import hg
             from mercurial import ui
+            from mercurial.i18n import gettext as _
             import os
             import popen2
             import smtplib
                     except: pass
             def patchbomb(ui, repo, *revs, **opts):
+                '''send changesets as a series of patch emails
+                The series starts with a "[PATCH 0 of N]" introduction, which
+                describes the series as a whole.
+                Each patch email has a Subject line of "[PATCH M of N] ...", using
+                the first line of the changeset description as the subject text.
+                The message contains two or three body parts.  First, the rest of
+                the changeset description.  Next, (optionally) if the diffstat
+                program is installed, the result of running diffstat on the patch.
+                Finally, the patch itself, as generated by "hg export".'''
                 def prompt(prompt, default = None, rest = ': ', empty_ok = False):
                     if default: prompt += ' [%s]' % default
                     prompt += rest
                         if r: return r
                         if default is not None: return default
                         if empty_ok: return r
-                        ui.warn('Please enter a valid value.\n')
+                        ui.warn(_('Please enter a valid value.\n'))
                 def confirm(s):
                     if not prompt(s, default = 'y', rest = '? ').lower().startswith('y'):
                         if summary:
                             ui.write(summary, '\n')
                             ui.write(s, '\n')
-                        confirm('Does the diffstat above look okay')
+                        confirm(_('Does the diffstat above look okay'))
                     return s
                 def makepatch(patch, idx, total):
                         self.container.append(''.join(self.lines).split('\n'))
                         self.lines = []
-                commands.export(ui, repo, *args, **{'output': exportee(patches),
+                commands.export(ui, repo, *revs, **{'output': exportee(patches),
                                                     'switch_parent': False,
                                                     'text': None})
                 jumbo = []
                 msgs = []
-                ui.write('This patch series consists of %d patches.\n\n' % len(patches))
+                ui.write(_('This patch series consists of %d patches.\n\n') % len(patches))
                 for p, i in zip(patches, range(len(patches))):
                     jumbo.extend(p)
                     msgs.append(makepatch(p, i + 1, len(patches)))
-                ui.write('\nWrite the introductory message for the patch series.\n\n')
+                ui.write(_('\nWrite the introductory message for the patch series.\n\n'))
                 sender = (opts['from'] or ui.config('patchbomb', 'from') or
                           prompt('From', ui.username()))
                 to = getaddrs('to', 'To')
                 cc = getaddrs('cc', 'Cc', '')
-                ui.write('Finish with ^D or a dot on a line by itself.\n\n')
+                ui.write(_('Finish with ^D or a dot on a line by itself.\n\n'))
                 body = []
                 ui.write('\n')
                 if opts['diffstat']:
-                    d = cdiffstat('Final summary:\n', jumbo)
+                    d = cdiffstat(_('Final summary:\n'), jumbo)
                     if d: msg.attach(MIMEText(d))
                 msgs.insert(0, msg)
                 if not opts['test']:
                     s.close()
-            if __name__ == '__main__':
+            cmdtable = {
-                optspec = [('c', 'cc', [], 'email addresses of copy recipients'),
+                'email':
-                           ('d', 'diffstat', None, 'add diffstat output to messages'),
+                (patchbomb,
-                           ('f', 'from', '', 'email address of sender'),
+                 [('c', 'cc', [], 'email addresses of copy recipients'),
-                           ('', 'plain', None, 'omit hg patch header'),
+                  ('d', 'diffstat', None, 'add diffstat output to messages'),
-                           ('n', 'test', None, 'print messages that would be sent'),
+                  ('f', 'from', '', 'email address of sender'),
-                           ('s', 'subject', '', 'subject of introductory message'),
+                  ('', 'plain', None, 'omit hg patch header'),
-                           ('t', 'to', [], 'email addresses of recipients')]
+                  ('n', 'test', None, 'print messages that would be sent'),
-                options = {}
+                  ('s', 'subject', '', 'subject of introductory message'),
-                try:
+                  ('t', 'to', [], 'email addresses of recipients')],
-                    args = fancyopts.fancyopts(sys.argv[1:], commands.globalopts + optspec,
+                 "hg email [OPTION]... [REV]...")
-                                               options)
-                except fancyopts.getopt.GetoptError, inst:
-                    u = ui.ui()
-                    u.warn('error: %s' % inst)
-                    sys.exit(1)
-                u = ui.ui(options["verbose"], options["debug"], options["quiet"],
-                          not options["noninteractive"])
-                repo = hg.repository(ui = u)
-                patchbomb(u, repo, *args, **options)

mercurial/localrepo.py

0 +7 -4

                     modified, added, removed, deleted, unknown = self.changes()
+                    # is this a jump, or a merge?  i.e. is there a linear path
+                    # from p1 to p2?
+                    linear_path = (pa == p1 or pa == p2)
+                    if allow and linear_path:
+                        raise util.Abort(_("there is nothing to merge, "
+                                           "just use 'hg update'"))
                     if allow and not forcemerge:
                         if modified or added or removed:
                             raise util.Abort(_("outstanding uncommited changes"))
                                     raise util.Abort(_("'%s' already exists in the working"
                                                        " dir and differs from remote") % f)
-                    # is this a jump, or a merge?  i.e. is there a linear path
-                    # from p1 to p2?
-                    linear_path = (pa == p1 or pa == p2)
                     # resolve the manifest to determine which files
                     # we care about merging
                     self.ui.note(_("resolving manifests\n"))

setup.py

0 +5 -1

                       author='Matt Mackall',
                       author_email='mpm@selenic.com',
                       url='http://selenic.com/mercurial',
-                      description='scalable distributed SCM',
+                      description='Scalable distributed SCM',
                       license='GNU GPL',
                       packages=['mercurial', 'hgext'],
                       ext_modules=[Extension('mercurial.mpatch', ['mercurial/mpatch.c']),
                                    glob.glob('templates/*.tmpl'))],
                       cmdclass=cmdclass,
                       scripts=['hg', 'hgmerge'],
+                      options=dict(bdist_mpkg=dict(zipdist=True,
+                                                   license='COPYING',
+                                                   readme='contrib/macosx/Readme.html',
+                                                   welcome='contrib/macosx/Welcome.html')),
                       **py2exe_opts)
             finally:
                 mercurial.version.forget_version()

templates/fileannotate-gitweb.tmpl

0 +1 -1

             </div>
             <div class="page_nav">
-            <a href="?cmd=summary;style=gitweb">summary</a> | <a href="?cmd=changelog;style=gitweb">changelog</a> | <a href="?cmd=tags;style=gitweb">tags</a> | <a href="?cmd=manifest;manifest=#manifest#;path=#path|urlescape#;style=gitweb">manifest</a> | <a href="?cmd=changeset;node=#node#;style=gitweb">changeset</a> | <a href="?cmd=file;file=#file|urlescape#;filenode=#filenode#;style=gitweb">file</a> | <a href="?cmd=filelog;file=#file|urlescape#;filenode=#filenode#;style=gitweb">revisions</a> | annotate<br/>
+            <a href="?cmd=summary;style=gitweb">summary</a> | <a href="?cmd=changelog;style=gitweb">changelog</a> | <a href="?cmd=tags;style=gitweb">tags</a> | <a href="?cmd=manifest;manifest=#manifest#;path=#path|urlescape#;style=gitweb">manifest</a> | <a href="?cmd=changeset;node=#node#;style=gitweb">changeset</a> | <a href="?cmd=file;file=#file|urlescape#;filenode=#filenode#;style=gitweb">file</a> | <a href="?cmd=filelog;file=#file|urlescape#;filenode=#filenode#;style=gitweb">revisions</a> | annotate | <a href="?cmd=annotate;file=#file|urlescape#;filenode=#filenode#;style=raw">raw</a><br/>
             </div>
             <div class="title">#file|escape#</div>

templates/fileannotate.tmpl

0 +1 0

             <a href="?mf=#manifest|short#;path=#path|urlescape#">manifest</a>
             <a href="?f=#filenode|short#;file=#file|urlescape#">file</a>
             <a href="?fl=#filenode|short#;file=#file|urlescape#">revisions</a>
+            <a href="?fa=#filenode|short#;file=#file|urlescape#;style=raw">raw</a>
             </div>
             <h2>Annotate #file|escape#</h2>

templates/map

0 +1 -1

             filelogparent = "<tr><td align="right">parent #rev#:&nbsp;</td><td><a href="?f=#node|short#;file=#file|urlescape#">#node|short#</a></td></tr>"
             filediffchild = "<tr><th class="child">child #rev#:</th><td class="child"><a href="?cs=#node|short#">#node|short#</a></td></tr>"
             filelogchild = "<tr><td align="right">child #rev#:&nbsp;</td><td><a href="?f=#node|short#;file=#file|urlescape#">#node|short#</a></td></tr>"
-            indexentry = "<tr class="parity#parity#"><td><a href="#url#">#name|escape#</a></td><td>#shortdesc|escape#</td><td>#contact|obfuscate#</td><td>#lastupdate|age# ago</td><td><a href="#url#?cl=tip;style=rss">RSS</a></td></tr>"
+            indexentry = "<tr class="parity#parity#"><td><a href="#url#">#name|escape#</a></td><td>#shortdesc#</td><td>#contact|obfuscate#</td><td>#lastupdate|age# ago</td><td><a href="#url#?cl=tip;style=rss">RSS</a></td></tr>"
             index = index.tmpl
             archiveentry = "<a href="?ca=#node|short#;type=#type|urlescape#">#type|escape#</a> "
             notfound = notfound.tmpl

templates/map-raw

0 +8 -7

             header = header-raw.tmpl
             footer = ""
             changeset = changeset-raw.tmpl
-            annotateline = "<tr class="parity#parity#"><td class="annotate"><a href="?cmd=changeset;node=#node#">#author#@#rev#</a></td><td><pre>#line|escape#</pre></td></tr>"
+            difflineplus = "#line#"
-            difflineplus = "#line|escape#"
+            difflineminus = "#line#"
-            difflineminus = "#line|escape#"
+            difflineat = "#line#"
-            difflineat = "#line|escape#"
+            diffline = "#line#"
-            diffline = "#line|escape#"
             changesetparent = "# parent: #node#"
             changesetchild = "# child: #node#"
-            filenodelink = "#file|urlescape#"
+            filenodelink = ""
             filerevision = filerevision-raw.tmpl
-            fileline = "#line|escape#"
+            fileline = "#line#"
             diffblock = "#lines#"
             filediff = filediff-raw.tmpl
+            fileannotate = fileannotate-raw.tmpl
+            annotateline = "#author#@#rev#: #line#"

tests/test-up-local-change

0 +24 -1

@@ -24,11 +24,34 b' hg commit -m "2" -d "0 0"'
24	cd ../r2	24	cd ../r2
25	hg -q pull ../r1	25	hg -q pull ../r1
26	hg status	26	hg status
		27	hg parents
27	hg --debug up	28	hg --debug up
		29	hg parents
		30	hg --debug up 0
		31	hg parents
28	hg --debug up -m \|\| echo failed	32	hg --debug up -m \|\| echo failed
29	hg --debug up -f -m	33	hg parents
		34	hg --debug up
30	hg parents	35	hg parents
31	hg -v history	36	hg -v history
32	hg diff \| sed -e "s/\(+++ [a-zA-Z0-9_/.-]\)./\1/" \	37	hg diff \| sed -e "s/\(+++ [a-zA-Z0-9_/.-]\)./\1/" \
33	-e "s/\(--- [a-zA-Z0-9_/.-]\)./\1/"	38	-e "s/\(--- [a-zA-Z0-9_/.-]\)./\1/"
34		39
		40	# create a second head
		41	cd ../r1
		42	hg up 0
		43	echo b2 > b
		44	echo a3 > a
		45	hg addremove
		46	hg commit -m "3" -d "0 0"
		47
		48	cd ../r2
		49	hg -q pull ../r1
		50	hg status
		51	hg parents
		52	hg --debug up \|\| echo failed
		53	hg --debug up -m \|\| echo failed
		54	hg --debug up -f -m
		55	hg parents
		56	hg diff \| sed -e "s/\(+++ [a-zA-Z0-9_/.-]\)./\1/" \
		57	-e "s/\(--- [a-zA-Z0-9_/.-]\)./\1/"

tests/test-up-local-change.out

0 +85 -4

@@ -7,6 +7,11 b' diff -r c19d34741b0a a'
7	+abc	7	+abc
8	adding b	8	adding b
9	M a	9	M a
		10	changeset: 0:c19d34741b0a
		11	user: test
		12	date: Thu Jan 1 00:00:00 1970 +0000
		13	summary: 1
		14
10	resolving manifests	15	resolving manifests
11	force None allow None moddirstate True linear True	16	force None allow None moddirstate True linear True
12	ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e	17	ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
@@ -16,11 +21,38 b' getting b'
16	merging a	21	merging a
17	resolving a	22	resolving a
18	file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2	23	file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2
19	abort: outstanding uncommited changes	24	changeset: 1:1e71731e6fbb
20	failed	25	tag: tip
		26	user: test
		27	date: Thu Jan 1 00:00:00 1970 +0000
		28	summary: 2
		29
21	resolving manifests	30	resolving manifests
22	force None allow 1 moddirstate True linear True	31	force None allow None moddirstate True linear True
23	ancestor ~~1165e8bd193e~~ local 1165e8bd193e remote ~~1165e8bd193e~~	32	ancestor a0c8bcbbb45c local 1165e8bd193e remote a0c8bcbbb45c
		33	remote deleted b
		34	removing b
		35	changeset: 0:c19d34741b0a
		36	user: test
		37	date: Thu Jan 1 00:00:00 1970 +0000
		38	summary: 1
		39
		40	abort: there is nothing to merge, just use 'hg update'
		41	failed
		42	changeset: 0:c19d34741b0a
		43	user: test
		44	date: Thu Jan 1 00:00:00 1970 +0000
		45	summary: 1
		46
		47	resolving manifests
		48	force None allow None moddirstate True linear True
		49	ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
		50	a versions differ, resolve
		51	remote created b
		52	getting b
		53	merging a
		54	resolving a
		55	file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2
24	changeset: 1:1e71731e6fbb	56	changeset: 1:1e71731e6fbb
25	tag: tip	57	tag: tip
26	user: test	58	user: test
@@ -50,3 +82,52 b' diff -r 1e71731e6fbb a'
50	@@ -1,1 +1,1 @@ a2	82	@@ -1,1 +1,1 @@ a2
51	-a2	83	-a2
52	+abc	84	+abc
		85	adding b
		86	M a
		87	changeset: 1:1e71731e6fbb
		88	user: test
		89	date: Thu Jan 1 00:00:00 1970 +0000
		90	summary: 2
		91
		92	resolving manifests
		93	force None allow None moddirstate True linear False
		94	ancestor a0c8bcbbb45c local 1165e8bd193e remote 4096f2872392
		95	a versions differ, resolve
		96	b versions differ, resolve
		97	this update spans a branch affecting the following files:
		98	a (resolve)
		99	b (resolve)
		100	aborting update spanning branches!
		101	(use update -m to merge across branches or -C to lose changes)
		102	failed
		103	abort: outstanding uncommited changes
		104	failed
		105	resolving manifests
		106	force None allow 1 moddirstate True linear False
		107	ancestor a0c8bcbbb45c local 1165e8bd193e remote 4096f2872392
		108	a versions differ, resolve
		109	b versions differ, resolve
		110	merging a
		111	resolving a
		112	file a: my d730145abbf9 other 13e0d5f949fa ancestor b789fdd96dc2
		113	merging b
		114	resolving b
		115	file b: my 1e88685f5dde other 61de8c7723ca ancestor 000000000000
		116	changeset: 1:1e71731e6fbb
		117	user: test
		118	date: Thu Jan 1 00:00:00 1970 +0000
		119	summary: 2
		120
		121	changeset: 2:83c51d0caff4
		122	tag: tip
		123	parent: 0:c19d34741b0a
		124	user: test
		125	date: Thu Jan 1 00:00:00 1970 +0000
		126	summary: 3
		127
		128	diff -r 1e71731e6fbb a
		129	--- a/a
		130	+++ b/a
		131	@@ -1,1 +1,1 @@ a2
		132	-a2
		133	+abc

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages