upstream/mercurial-mirror Commit - r2705:030d0abd

merge with crew.

Vadim Gelfer -

r2705:030d0abd default

parent child

templates/shortlog.tmpl

0 created 644 +38 0

@@ -0,0 +1,38 b''
	1	#header#
	2	<title>#repo\|escape#: shortlog</title>
	3	<link rel="alternate" type="application/rss+xml"
	4	href="?cmd=changelog;style=rss" title="RSS feed for #repo\|escape#">
	5	</head>
	6	<body>
	7
	8	<div class="buttons">
	9	<a href="?cl=#rev#">changelog</a>
	10	<a href="?cmd=tags">tags</a>
	11	<a href="?mf=#manifest\|short#;path=/">manifest</a>
	12	#archives%archiveentry#
	13	<a type="application/rss+xml" href="?style=rss">rss</a>
	14	</div>
	15
	16	<h2>shortlog for #repo\|escape#</h2>
	17
	18	<form action="#">
	19	<p>
	20	<label for="search1">search:</label>
	21	<input type="hidden" name="cmd" value="changelog">
	22	<input name="rev" id="search1" type="text" size="30">
	23	navigate: <small class="navigate">#changenav%navshortentry#</small>
	24	</p>
	25	</form>
	26
	27	#entries%shortlogentry#
	28
	29	<form action="#">
	30	<p>
	31	<label for="search2">search:</label>
	32	<input type="hidden" name="cmd" value="changelog">
	33	<input name="rev" id="search2" type="text" size="30">
	34	navigate: <small class="navigate">#changenav%navshortentry#</small>
	35	</p>
	36	</form>
	37
	38	#footer#

templates/shortlogentry.tmpl

0 created 644 +7 0

@@ -0,0 +1,7 b''
	1	<table class="slogEntry parity#parity#">
	2	<tr>
	3	<td class="age">#date\|age#</td>
	4	<td class="author">#author\|obfuscate#</td>
	5	<td class="node"><a href="?cs=#node\|short#">#desc\|strip\|firstline\|escape#</a></td>
	6	</tr>
	7	</table>

tests/test-mq-qrefresh-replace-log-message

0 created 644 +51 0

@@ -0,0 +1,51 b''
	1	#!/bin/sh
	2
	3	# Environement setup for MQ
	4	export HGRCPATH=./hgrc
	5	echo "[extensions]" >> ./hgrc
	6	echo "mq=" >> ./hgrc
	7
	8	#Repo init
	9	hg init
	10	hg qinit
	11
	12	hg qnew -m "First commit message" first-patch
	13	echo aaaa > file
	14	hg add file
	15	hg qrefresh
	16	echo =======================
	17	echo "Should display 'First commit message'"
	18	hg log -l1 -v \| sed -n '/description/,$p'
	19	echo
	20
	21	# Testing changing message with -m
	22	echo bbbb > file
	23	hg qrefresh -m "Second commit message"
	24	echo =======================
	25	echo "Should display 'Second commit message'"
	26	hg log -l1 -v \| sed -n '/description/,$p'
	27	echo
	28
	29
	30	# Testing changing message with -l
	31	echo "Third commit message" > logfile
	32	echo " This is the 3rd log message" >> logfile
	33	echo bbbb > file
	34	hg qrefresh -l logfile
	35	echo =======================
	36	echo "Should display 'Third commit message\n This is the 3rd log message'"
	37	hg log -l1 -v \| sed -n '/description/,$p'
	38	echo
	39
	40	# Testing changing message with -l-
	41	hg qnew -m "First commit message" second-patch
	42	echo aaaa > file2
	43	hg add file2
	44	echo bbbb > file2
	45	(echo "Fifth commit message"
	46	echo " This is the 5th log message" >> logfile) \|\
	47	hg qrefresh -l-
	48	echo =======================
	49	echo "Should display 'Fifth commit message\n This is the 5th log message'"
	50	hg log -l1 -v \| sed -n '/description/,$p'
	51	echo

tests/test-mq-qrefresh-replace-log-message.out

0 created 644 +29 0

@@ -0,0 +1,29 b''
	1	=======================
	2	Should display 'First commit message'
	3	description:
	4	First commit message
	5
	6
	7
	8	=======================
	9	Should display 'Second commit message'
	10	description:
	11	Second commit message
	12
	13
	14
	15	=======================
	16	Should display 'Third commit message\n This is the 3rd log message'
	17	description:
	18	Third commit message
	19	This is the 3rd log message
	20
	21
	22
	23	=======================
	24	Should display 'Fifth commit message\n This is the 5th log message'
	25	description:
	26	Fifth commit message
	27
	28
	29

MANIFEST.in

0 +3 -1

             recursive-include mercurial *.py
             include hgweb.cgi hgwebdir.cgi
             include hgeditor rewrite-log
-            include tests/README tests/coverage.py tests/run-tests.py tests/md5sum.py tests/test-*[a-z0-9] tests/*.out
+            include tests/README tests/*.py tests/test-*[a-z0-9] tests/*.out
             prune tests/*.err
             include *.txt
             include templates/map templates/map-*[a-z0-9]
             include templates/static/*
             include doc/README doc/Makefile doc/gendoc.py doc/*.txt doc/*.html doc/*.[0-9]
             recursive-include contrib *
+            recursive-include hgext *
             include README
             include CONTRIBUTORS
             include COPYING
             include Makefile
             include MANIFEST.in
+            prune *.elc *.orig *.rej *~ *.o *.so *.pyc *.swp *.prof

contrib/bash_completion

0 +6 -1

             _hg_cmd_qdelete()
             {
-                _hg_ext_mq_patchlist qseries
+                _hg_ext_mq_patchlist qunapplied
             }
             _hg_cmd_qsave()
                 COMPREPLY=(${COMPREPLY[@]:-} $(compgen -W '$files' -- "$cur"))
             }
+            _hg_cmd_export()
+            {
+                _hg_ext_mq_patchlist qapplied
+            }
             # hbisect
             _hg_cmd_bisect()

contrib/macosx/Welcome.html

0 +62 -2

@@ -5,13 +5,73 b''
5	<meta http-equiv="Content-Style-Type" content="text/css">	5	<meta http-equiv="Content-Style-Type" content="text/css">
6	<title></title>	6	<title></title>
7	<style type="text/css">	7	<style type="text/css">
8	p.p1 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica}	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}	9	p.p2 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica; min-height: 14.0px}
10	</style>	10	</style>
11	</head>	11	</head>
12	<body>	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>	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>	14	<p class="p2"><br></p>
15	<p class="p1">It is based on Mercurial 0.9.</p>	15	<p class="p1">It is based on Mercurial 0.9.1</p>
		16	<br>
		17	<pre>
		18	Release Notes
		19	-------------
		20
		21	2006-07-24 v0.9.1
		22
		23	Major changes between Mercurial 0.9 and 0.9.1:
		24
		25	New features:
		26	- You can now configure your 'hgweb' server to let remote users
		27	'push' changes over http.
		28	- You can now 'import' a patch in a mail message by saving the mail
		29	message, and importing it. This works for patches sent either
		30	inline or as attachments.
		31	- The 'diff' command now accepts '-rA:B' syntax as a synonym for
		32	'-r A -r B', and adds '-b' and '-B' options.
		33
		34	New contributions and extensions:
		35	- The 'acl' extension lets you lock down parts of a repository
		36	against incoming changes
		37	- The 'extdiff' extension lets you run your favourite graphical
		38	change viewer
		39	- Comprehensive integration with the 'vim' editor
		40	- A restricted shell for 'ssh'-hosted repositories
		41	- An importer for 'darcs' repositories
		42
		43	New hooks added:
		44	- 'preupdate' is run before an update or merge in the working
		45	directory.
		46	- 'update' is run after an update or merge in the working
		47	directory.
		48
		49	Behaviour changes:
		50	- NOTE: Mercurial as installed by the Windows binary
		51	installer no longer performs automatic line-ending conversion for
		52	Unix/Linux compatibility. To re-enable this feature, edit your
		53	'mercurial.ini' file after you upgrade.
		54	- The Windows binary installer now automatically adds 'hg' to your
		55	'%PATH%'.
		56	- The 'backout' command now runs an editor by default, to let you
		57	modify the commit message for a backed-out changeset.
		58	- An earlier problem with parsing of tags has been fixed.
		59	This makes tag parsing slower but more reliable.
		60
		61	Memory usage and performance improvements:
		62	- The 'remove' command has been rewritten to be hundreds of times
		63	faster in large repositories.
		64	- It is now possible to 'clone' a repository very quickly over a
		65	LAN, if the server is configured to allow it. See the new 'server'
		66	section in the 'hgrc' documentation.
		67
		68	Other changes of note:
		69	- Mercurial will now print help for an extension if you type 'hg
		70	help EXT_NAME'.
		71	- The usual array of bug fixes and documentation improvements.
		72	- The integrated web server is now more WSGI-compliant.
		73	- Work has begun to solidify Mercurial's API for use by third-party
		74	packages.
		75	</pre>
16	</body>	76	</body>
17	</html>	77	</html>

contrib/mercurial.el

0 +5 -2

               (save-excursion
                 (while hg-prev-buffer
                   (set-buffer hg-prev-buffer))
-                (let ((path (or default (buffer-file-name) default-directory)))
+                (let ((path (or default
+                                (buffer-file-name)
+                                (expand-file-name default-directory))))
                   (if (or (not path) current-prefix-arg)
                       (expand-file-name
                        (eval (list* 'read-file-name
                   (cd (hg-root path)))
                 (when update
                   (with-current-buffer buf
-            	(set (make-local-variable 'backup-inhibited) nil)
+                    (when (local-variable-p 'backup-inhibited)
+                      (kill-local-variable 'backup-inhibited))
             	(hg-mode-line)))))
             (defun hg-incoming (&optional repo)

contrib/win32/ReadMe.html

0 +1 -1

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

contrib/win32/mercurial.iss

0 +3 -3

             [Setup]
             AppCopyright=Copyright 2005, 2006 Matt Mackall and others
             AppName=Mercurial
-            AppVerName=Mercurial version 0.9
+            AppVerName=Mercurial version 0.9.1
             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.9
+            OutputBaseFilename=Mercurial-0.9.1
             DefaultDirName={sd}\Mercurial
             SourceDir=C:\hg\hg-release
-            VersionInfoVersion=0.9
+            VersionInfoVersion=0.9.1
             VersionInfoDescription=Mercurial distributed SCM
             VersionInfoCopyright=Copyright 2005, 2006 Matt Mackall and others
             VersionInfoCompany=Matt Mackall and others

contrib/win32/postinstall.txt

0 +56 0

@@ -7,6 +7,62 b' file that comes with this package.'
7	Release Notes	7	Release Notes
8	-------------	8	-------------
9		9
		10	2006-07-24 v0.9.1
		11
		12	Major changes between Mercurial 0.9 and 0.9.1:
		13
		14	New features:
		15	- You can now configure your 'hgweb' server to let remote users
		16	'push' changes over http.
		17	- You can now 'import' a patch in a mail message by saving the mail
		18	message, and importing it. This works for patches sent either
		19	inline or as attachments.
		20	- The 'diff' command now accepts '-rA:B' syntax as a synonym for
		21	'-r A -r B', and adds '-b' and '-B' options.
		22
		23	New contributions and extensions:
		24	- The 'acl' extension lets you lock down parts of a repository
		25	against incoming changes
		26	- The 'extdiff' extension lets you run your favourite graphical
		27	change viewer
		28	- Comprehensive integration with the 'vim' editor
		29	- A restricted shell for 'ssh'-hosted repositories
		30	- An importer for 'darcs' repositories
		31
		32	New hooks added:
		33	- 'preupdate' is run before an update or merge in the working
		34	directory.
		35	- 'update' is run after an update or merge in the working
		36	directory.
		37
		38	Behaviour changes:
		39	- NOTE: Mercurial as installed by the Windows binary
		40	installer no longer performs automatic line-ending conversion for
		41	Unix/Linux compatibility. To re-enable this feature, edit your
		42	'mercurial.ini' file after you upgrade.
		43	- The Windows binary installer now automatically adds 'hg' to your
		44	'%PATH%'.
		45	- The 'backout' command now runs an editor by default, to let you
		46	modify the commit message for a backed-out changeset.
		47	- An earlier problem with parsing of tags has been fixed.
		48	This makes tag parsing slower but more reliable.
		49
		50	Memory usage and performance improvements:
		51	- The 'remove' command has been rewritten to be hundreds of times
		52	faster in large repositories.
		53	- It is now possible to 'clone' a repository very quickly over a
		54	LAN, if the server is configured to allow it. See the new 'server'
		55	section in the 'hgrc' documentation.
		56
		57	Other changes of note:
		58	- Mercurial will now print help for an extension if you type 'hg
		59	help EXT_NAME'.
		60	- The usual array of bug fixes and documentation improvements.
		61	- The integrated web server is now more WSGI-compliant.
		62	- Work has begun to solidify Mercurial's API for use by third-party
		63	packages.
		64
		65
10	2006-05-10 v0.9	66	2006-05-10 v0.9
11		67
12	* Major changes between Mercurial 0.8.1 and 0.9:	68	* Major changes between Mercurial 0.8.1 and 0.9:

doc/hgrc.5.txt

0 +19 -5

               from;;
                 Optional.  Email address to use in "From" header and SMTP envelope
                 of outgoing messages.
+              to;;
+                Optional.  Comma-separated list of recipients' email addresses.
+              cc;;
+                Optional.  Comma-separated list of carbon copy recipients'
+                email addresses.
+              bcc;;
+                Optional.  Comma-separated list of blind carbon copy
+                recipients' email addresses.  Cannot be set interactively.
               method;;
                 Optional.  Method to use to send email messages.  If value is
-                "smtp" (default), use SMTP (see section "[mail]" for
+                "smtp" (default), use SMTP (see section "[smtp]" for
                 configuration).  Otherwise, use as name of program to run that
                 acts like sendmail (takes "-f" option for sender, list of
                 recipients on command line, message on stdin).  Normally, setting
               changegroup;;
                 Run after a changegroup has been added via push, pull or
-                unbundle. ID of the first new changeset is in $HG_NODE.
+                unbundle. ID of the first new changeset is in $HG_NODE.  URL from
+                which changes came is in $HG_URL.
               commit;;
                 Run after a changeset has been created in the local repository.
                 ID of the newly created changeset is in $HG_NODE.  Parent
               incoming;;
                 Run after a changeset has been pulled, pushed, or unbundled into
                 the local repository.  The ID of the newly arrived changeset is in
-                $HG_NODE.
+                $HG_NODE.  URL that was source of changes came is in $HG_URL.
               outgoing;;
                 Run after sending changes from local repository to another.  ID of
                 first changeset sent is in $HG_NODE.  Source of operation is in
               prechangegroup;;
                 Run before a changegroup is added via push, pull or unbundle.
                 Exit status 0 allows the changegroup to proceed.  Non-zero status
-                will cause the push, pull or unbundle to fail.
+                will cause the push, pull or unbundle to fail.  URL from which
+                changes will come is in $HG_URL.
               precommit;;
                 Run before starting a local commit.  Exit status 0 allows the
                 commit to proceed.  Non-zero status will cause the commit to fail.
                 before accepting them.  Passed the ID of the first new changeset
                 in $HG_NODE.  Exit status 0 allows the transaction to commit.
                 Non-zero status will cause the transaction to be rolled back and
-                the push, pull or unbundle will fail.
+                the push, pull or unbundle will fail.  URL that was source of
+                changes is in $HG_URL.
               pretxncommit;;
                 Run after a changeset has been created but the transaction not yet
                 committed.  Changeset is visible to hook program.  This lets you
               push_ssl;;
                 Whether to require that inbound pushes be transported over SSL to
                 prevent password sniffing.  Default is true.
+              stripes;;
+                How many lines a "zebra stripe" should span in multiline output.
+                Default is 1; set to 0 to disable.
               style;;
                 Which template map style to use.
               templates;;

hgext/extdiff.py

0 +3 0

             #   cmd.vdiff = kdiff3
             #   # add new command called meld, runs meld (no need to name twice)
             #   cmd.meld =
+            #   # add new command called vimdiff, runs gvimdiff with DirDiff plugin
+            #   #(see http://www.vim.org/scripts/script.php?script_id=102)
+            #   cmd.vimdiff = LC_ALL=C gvim -f '+bdel 1 2' '+ execute "DirDiff ".argv(0)." ".argv(1)'
             #
             # you can use -I/-X and list of file or directory names like normal
             # "hg diff" command. extdiff makes snapshots of only needed files, so

hgext/mq.py

0 +152 -56

                     head = self.qparents(repo)
                     for patch in series:
-                        patch = mergeq.lookup(patch)
+                        patch = mergeq.lookup(patch, strict=True)
                         if not patch:
                             self.ui.warn("patch %s does not exist\n" % patch)
                             return (1, None)
                     return (err, n)
                 def delete(self, repo, patch):
-                    patch = self.lookup(patch)
+                    patch = self.lookup(patch, strict=True)
                     info = self.isapplied(patch)
                     if info:
                         self.ui.warn("cannot delete applied patch %s\n" % patch)
                             commitfiles = c + a + r
                     self.check_toppatch(repo)
                     wlock = repo.wlock()
-                    insert = self.series_end()
+                    insert = self.full_series_end()
                     if msg:
                         n = repo.commit(commitfiles, "[mq]: %s" % msg, force=True,
                                         wlock=wlock)
                     r = self.qrepo()
                     if r: r.add([patch])
                     if commitfiles:
-                        self.refresh(repo, short=True)
+                        self.refresh(repo, msg=None, short=True)
                 def strip(self, repo, rev, update=True, backup="all", wlock=None):
                     def limitheads(chlog, stop):
                     revnum = chlog.rev(rev)
                     if update:
+                        (c, a, r, d, u) = repo.changes(None, None)
+                        if c or a or d or r:
+                            raise util.Abort(_("Local changes found"))
                         urev = self.qparents(repo, rev)
                         repo.update(urev, allow=False, force=True, wlock=wlock)
                         repo.dirstate.write()
                             return (i, a[0], a[1])
                     return None
-                def lookup(self, patch):
+                # if the exact patch name does not exist, we try a few
+                # variations.  If strict is passed, we try only #1
+                #
+                # 1) a number to indicate an offset in the series file
+                # 2) a unique substring of the patch name was given
+                # 3) patchname[-+]num to indicate an offset in the series file
+                def lookup(self, patch, strict=False):
+                    def partial_name(s):
+                        count = 0
+                        if s in self.series:
+                            return s
+                        for x in self.series:
+                            if s in x:
+                                count += 1
+                                last = x
+                            if count > 1:
+                                return None
+                        if count:
+                            return last
+                        if len(self.series) > 0 and len(self.applied) > 0:
+                            if s == 'qtip':
+                                return self.series[self.series_end()-1]
+                            if s == 'qbase':
+                                return self.series[0]
+                        return None
                     if patch == None:
                         return None
-                    if patch in self.series:
-                        return patch
+                    # we don't want to return a partial match until we make
+                    # sure the file name passed in does not exist (checked below)
+                    res = partial_name(patch)
+                    if res and res == patch:
+                        return res
                     if not os.path.isfile(os.path.join(self.path, patch)):
                         try:
                             sno = int(patch)
                         except(ValueError, OverflowError):
-                            self.ui.warn("patch %s not in series\n" % patch)
+                            pass
-                            sys.exit(1)
+                        else:
-                        if sno >= len(self.series):
+                            if sno < len(self.series):
-                            self.ui.warn("patch number %d is out of range\n" % sno)
+                                patch = self.series[sno]
-                            sys.exit(1)
+                                return patch
-                        patch = self.series[sno]
+                        if not strict:
-                    else:
+                            # return any partial match made above
-                        self.ui.warn("patch %s not in series\n" % patch)
+                            if res:
-                        sys.exit(1)
+                                return res
-                    return patch
+                            minus = patch.rsplit('-', 1)
+                            if len(minus) > 1:
+                                res = partial_name(minus[0])
+                                if res:
+                                    i = self.series.index(res)
+                                    try:
+                                        off = int(minus[1] or 1)
+                                    except(ValueError, OverflowError):
+                                        pass
+                                    else:
+                                        if i - off >= 0:
+                                            return self.series[i - off]
+                            plus = patch.rsplit('+', 1)
+                            if len(plus) > 1:
+                                res = partial_name(plus[0])
+                                if res:
+                                    i = self.series.index(res)
+                                    try:
+                                        off = int(plus[1] or 1)
+                                    except(ValueError, OverflowError):
+                                        pass
+                                    else:
+                                        if i + off < len(self.series):
+                                            return self.series[i + off]
+                    self.ui.warn("patch %s not in series\n" % patch)
+                    sys.exit(1)
                 def push(self, repo, patch=None, force=False, list=False,
                          mergeq=None, wlock=None):
                         self.ui.write("Now at: %s\n" % top)
                     return ret[0]
-                def pop(self, repo, patch=None, force=False, update=True, wlock=None):
+                def pop(self, repo, patch=None, force=False, update=True, all=False,
+                        wlock=None):
                     def getfile(f, rev):
                         t = repo.file(f).read(rev)
                         try:
                     self.applied_dirty = 1;
                     end = len(self.applied)
                     if not patch:
-                        info = [len(self.applied) - 1] + self.applied[-1].split(':')
+                        if all:
+                            popi = 0
+                        else:
+                            popi = len(self.applied) - 1
+                    else:
+                        popi = info[0] + 1
+                        if popi >= end:
+                            self.ui.warn("qpop: %s is already at the top\n" % patch)
+                            return
+                    info = [ popi ] + self.applied[popi].split(':')
                     start = info[0]
                     rev = revlog.bin(info[1])
                     qp = self.qparents(repo, top)
                     commands.dodiff(sys.stdout, self.ui, repo, qp, None, files)
-                def refresh(self, repo, short=False):
+                def refresh(self, repo, msg=None, short=False):
                     if len(self.applied) == 0:
                         self.ui.write("No patches applied\n")
                         return
                         repo.dirstate.update(c, 'n')
                         repo.dirstate.forget(forget)
-                        if not message:
+                        if not msg:
-                            message = "patch queue: %s\n" % patch
+                            if not message:
+                                message = "patch queue: %s\n" % patch
+                            else:
+                                message = "\n".join(message)
                         else:
-                            message = "\n".join(message)
+                            message = msg
                         self.strip(repo, top, update=False, backup='strip', wlock=wlock)
                         n = repo.commit(filelist, message, changes[1], force=1, wlock=wlock)
                         self.applied[-1] = revlog.hex(n) + ':' + patch
                     else:
                         start = self.series.index(patch) + 1
                     for p in self.series[start:]:
+                        if self.ui.verbose:
+                            self.ui.write("%d " % self.series.index(p))
                         self.ui.write("%s\n" % p)
                 def qseries(self, repo, missing=None):
                     self.applied.append(revlog.hex(n) + ":" + '.hg.patches.save.line')
                     self.applied_dirty = 1
+                def full_series_end(self):
+                    if len(self.applied) > 0:
+                        (top, p) = self.applied[-1].split(':')
+                        end = self.find_series(p)
+                        if end == None:
+                            return len(self.full_series)
+                        return end + 1
+                    return 0
                 def series_end(self):
                     end = 0
                     if len(self.applied) > 0:
                 def appliedname(self, index):
                     p = self.applied[index]
+                    pname = p.split(':')[1]
                     if not self.ui.verbose:
-                        p = p.split(':')[1]
+                        p = pname
+                    else:
+                        p = str(self.series.index(pname)) + " " + p
                     return p
                 def top(self, repo):
                     if end == len(self.series):
                         self.ui.write("All patches applied\n")
                     else:
-                        self.ui.write(self.series[end] + '\n')
+                        p = self.series[end]
+                        if self.ui.verbose:
+                            self.ui.write("%d " % self.series.index(p))
+                        self.ui.write(p + '\n')
                 def prev(self, repo):
                     if len(self.applied) > 1:
                         if patch in self.series:
                             self.ui.warn("patch %s is already in the series file\n" % patch)
                             sys.exit(1)
-                        index = self.series_end() + i
+                        index = self.full_series_end() + i
                         self.full_series[index:index] = [patch]
                         self.read_series(self.full_series)
                         self.ui.warn("adding %s to series file\n" % patch)
             def new(ui, repo, patch, **opts):
                 """create a new patch"""
                 q = repomap[repo]
-                q.new(repo, patch, msg=opts['message'], force=opts['force'])
+                message=commands.logmessage(**opts)
+                q.new(repo, patch, msg=message, force=opts['force'])
                 q.save_dirty()
                 return 0
             def refresh(ui, repo, **opts):
                 """update the current patch"""
                 q = repomap[repo]
-                q.refresh(repo, short=opts['short'])
+                message=commands.logmessage(**opts)
+                q.refresh(repo, msg=message, short=opts['short'])
                 q.save_dirty()
                 return 0
                     localupdate = False
                 else:
                     q = repomap[repo]
-                if opts['all'] and len(q.applied) > 0:
+                q.pop(repo, patch, force=opts['force'], update=localupdate, all=opts['all'])
-                    patch = q.applied[0].split(':')[1]
-                q.pop(repo, patch, force=opts['force'], update=localupdate)
                 q.save_dirty()
                 return 0
             def save(ui, repo, **opts):
                 """save current queue state"""
                 q = repomap[repo]
-                ret = q.save(repo, msg=opts['message'])
+                message=commands.logmessage(**opts)
+                ret = q.save(repo, msg=message)
                 if ret:
                     return ret
                 q.save_dirty()
             def reposetup(ui, repo):
                 repomap[repo] = queue(ui, repo.join(""))
-                oldlookup = repo.lookup
+                oldtags = repo.tags
+                def qtags():
+                    if repo.tagscache:
+                        return repo.tagscache
-                def qlookup(key):
+                    tagscache = oldtags()
-                    try:
-                        return oldlookup(key)
+                    q = repomap[repo]
-                    except hg.RepoError:
+                    if len(q.applied) == 0:
-                        q = repomap[repo]
+                        return tagscache
-                        qpatchnames = { 'qtip': -1, 'qbase': 0 }
+                    mqtags = [patch.split(':') for patch in q.applied]
-                        if key in qpatchnames:
+                    mqtags.append((mqtags[-1][0], 'qtip'))
-                            if len(q.applied) == 0:
+                    mqtags.append((mqtags[0][0], 'qbase'))
-                                self.ui.warn('No patches applied\n')
+                    for patch in mqtags:
-                                raise
+                        if patch[1] in tagscache:
-                            patch = q.applied[qpatchnames[key]].split(':')[0]
+                            repo.ui.warn('Tag %s overrides mq patch of the same name\n' % patch[1])
-                            return revlog.bin(patch)
+                        else:
+                            tagscache[patch[1]] = revlog.bin(patch[0])
-                        patch = q.isapplied(key)
+                    return tagscache
-                        if not patch:
-                            raise
-                        return revlog.bin(patch[1])
-                repo.lookup = qlookup
+                repo.tags = qtags
             cmdtable = {
                 "qapplied": (applied, [], 'hg qapplied [PATCH]'),
                      'hg qinit [-c]'),
                 "qnew":
                     (new,
-                     [('m', 'message', '', 'commit message'),
+                     [('m', 'message', '', _('use <text> as commit message')),
+                      ('l', 'logfile', '', _('read the commit message from <file>')),
                       ('f', 'force', None, 'force')],
-                     'hg qnew [-m TEXT] [-f] PATCH'),
+                     'hg qnew [-m TEXT] [-l FILE] [-f] PATCH'),
                 "qnext": (next, [], 'hg qnext'),
                 "qprev": (prev, [], 'hg qprev'),
                 "^qpop":
                      'hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]'),
                 "^qrefresh":
                     (refresh,
-                     [('s', 'short', None, 'short refresh')],
+                     [('m', 'message', '', _('change commit message with <text>')),
-                     'hg qrefresh [-s]'),
+                      ('l', 'logfile', '', _('change commit message with <file> content')),
+                      ('s', 'short', None, 'short refresh')],
+                     'hg qrefresh [-m TEXT] [-l FILE] [-s]'),
                 "qrestore":
                     (restore,
                      [('d', 'delete', None, 'delete save entry'),
                      'hg qrestore [-d] [-u] REV'),
                 "qsave":
                     (save,
-                     [('m', 'message', '', 'commit message'),
+                     [('m', 'message', '', _('use <text> as commit message')),
+                      ('l', 'logfile', '', _('read the commit message from <file>')),
                       ('c', 'copy', None, 'copy patch directory'),
                       ('n', 'name', '', 'copy directory name'),
                       ('e', 'empty', None, 'clear queue status file'),
                       ('f', 'force', None, 'force copy')],
-                     'hg qsave [-m TEXT] [-c] [-n NAME] [-e] [-f]'),
+                     'hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]'),
                 "qseries":
                     (series,
                      [('m', 'missing', None, 'print patches not in series')],

hgext/patchbomb.py

0 +10 -3

             # from = My Name <my@email>
             # to = recipient1, recipient2, ...
             # cc = cc1, cc2, ...
+            # bcc = bcc1, bcc2, ...
             from mercurial.demandload import *
             demandload(globals(), '''email.MIMEMultipart email.MIMEText email.Utils
                 to = getaddrs('to', 'To')
                 cc = getaddrs('cc', 'Cc', '')
+                bcc = opts['bcc'] or (ui.config('email', 'bcc') or
+                                      ui.config('patchbomb', 'bcc') or '').split(',')
+                bcc = [a.strip() for a in bcc if a.strip()]
                 if len(patches) > 1:
                     ui.write(_('\nWrite the introductory message for the patch series.\n\n'))
                     start_time += 1
                     m['From'] = sender
                     m['To'] = ', '.join(to)
-                    if cc: m['Cc'] = ', '.join(cc)
+                    if cc: m['Cc']  = ', '.join(cc)
+                    if bcc: m['Bcc'] = ', '.join(bcc)
                     if opts['test']:
                         ui.status('Displaying ', m['Subject'], ' ...\n')
                         fp = os.popen(os.getenv('PAGER', 'more'), 'w')
                         fp.close()
                     else:
                         ui.status('Sending ', m['Subject'], ' ...\n')
-                        mail.sendmail(sender, to + cc, m.as_string(0))
+                        mail.sendmail(sender, to + bcc + cc, m.as_string(0))
             cmdtable = {
                 'email':
                 (patchbomb,
-                 [('c', 'cc', [], 'email addresses of copy recipients'),
+                 [('', 'bcc', [], 'email addresses of blind copy recipients'),
+                  ('c', 'cc', [], 'email addresses of copy recipients'),
                   ('d', 'diffstat', None, 'add diffstat output to messages'),
                   ('f', 'from', '', 'email address of sender'),
                   ('', 'plain', None, 'omit hg patch header'),

mercurial/bundlerepo.py

0 +7 0

             class bundlerepository(localrepo.localrepository):
                 def __init__(self, ui, path, bundlename):
                     localrepo.localrepository.__init__(self, ui, path)
+                    self._url = 'bundle:' + bundlename
+                    if path: self._url += '+' + path
                     self.tempfile = None
                     self.bundlefile = open(bundlename, "rb")
                     header = self.bundlefile.read(6)
                         for c in changegroup.chunkiter(self.bundlefile):
                             pass
+                def url(self):
+                    return self._url
                 def dev(self):
                     return -1

mercurial/commands.py

0 +22 -16

@@ -40,6 +40,25 b' def relpath(repo, args):'
40	return [util.normpath(os.path.join(cwd, x)) for x in args]	40	return [util.normpath(os.path.join(cwd, x)) for x in args]
41	return args	41	return args
42		42
		43	def logmessage(**opts):
		44	""" get the log message according to -m and -l option """
		45	message = opts['message']
		46	logfile = opts['logfile']
		47
		48	if message and logfile:
		49	raise util.Abort(_('options --message and --logfile are mutually '
		50	'exclusive'))
		51	if not message and logfile:
		52	try:
		53	if logfile == '-':
		54	message = sys.stdin.read()
		55	else:
		56	message = open(logfile).read()
		57	except IOError, inst:
		58	raise util.Abort(_("can't read commit message '%s': %s") %
		59	(logfile, inst.strerror))
		60	return message
		61
43	def matchpats(repo, pats=[], opts={}, head=''):	62	def matchpats(repo, pats=[], opts={}, head=''):
44	cwd = repo.getcwd()	63	cwd = repo.getcwd()
45	if not pats and cwd:	64	if not pats and cwd:
@@ -989,21 +1008,7 b' def commit(ui, repo, pats, *opts):'
989	If no commit message is specified, the editor configured in your hgrc	1008	If no commit message is specified, the editor configured in your hgrc
990	or in the EDITOR environment variable is started to enter a message.	1009	or in the EDITOR environment variable is started to enter a message.
991	"""	1010	"""
992	message = opts[~~'message'~~]	1011	message = logmessage(**opts)
993	logfile = opts['logfile']
994
995	if message and logfile:
996	raise util.Abort(_('options --message and --logfile are mutually '
997	'exclusive'))
998	if not message and logfile:
999	try:
1000	if logfile == '-':
1001	message = sys.stdin.read()
1002	else:
1003	message = open(logfile).read()
1004	except IOError, inst:
1005	raise util.Abort(_("can't read commit message '%s': %s") %
1006	(logfile, inst.strerror))
1007		1012
1008	if opts['addremove']:	1013	if opts['addremove']:
1009	addremove_lock(ui, repo, pats, opts)	1014	addremove_lock(ui, repo, pats, opts)
@@ -2763,7 +2768,8 b' def unbundle(ui, repo, fname, **opts):'
2763	raise util.Abort(_("%s: unknown bundle compression type")	2768	raise util.Abort(_("%s: unknown bundle compression type")
2764	% fname)	2769	% fname)
2765	gen = generator(util.filechunkiter(f, 4096))	2770	gen = generator(util.filechunkiter(f, 4096))
2766	modheads = repo.addchangegroup(util.chunkbuffer(gen), 'unbundle')	2771	modheads = repo.addchangegroup(util.chunkbuffer(gen), 'unbundle',
		2772	'bundle:' + fname)
2767	return postincoming(ui, repo, modheads, opts['update'])	2773	return postincoming(ui, repo, modheads, opts['update'])
2768		2774
2769	def undo(ui, repo):	2775	def undo(ui, repo):

mercurial/dirstate.py

0 +5 -1

                 # directly by this function, but might be modified by your statmatch call.
                 #
                 def walkhelper(self, files, statmatch, dc, badmatch=None):
+                    # self.root may end with a path separator when self.root == '/'
+                    common_prefix_len = len(self.root)
+                    if not self.root.endswith('/'):
+                        common_prefix_len += 1
                     # recursion free walker, faster than os.walk.
                     def findfiles(s):
                         work = [s]
                             names = os.listdir(top)
                             names.sort()
                             # nd is the top of the repository dir tree
-                            nd = util.normpath(top[len(self.root) + 1:])
+                            nd = util.normpath(top[common_prefix_len:])
                             if nd == '.':
                                 nd = ''
                             else:

mercurial/hgweb/hgweb_mod.py

0 +54 -22

                     self.mtime = -1
                     self.reponame = name
                     self.archives = 'zip', 'gz', 'bz2'
+                    self.stripecount = 1
                     self.templatepath = self.repo.ui.config("web", "templates",
                                                             templater.templatepath())
                         self.mtime = mtime
                         self.repo = hg.repository(self.repo.ui, self.repo.root)
                         self.maxchanges = int(self.repo.ui.config("web", "maxchanges", 10))
+                        self.stripecount = int(self.repo.ui.config("web", "stripes", 1))
+                        self.maxshortchanges = int(self.repo.ui.config("web", "maxshortchanges", 60))
                         self.maxfiles = int(self.repo.ui.config("web", "maxfiles", 10))
                         self.allowpull = self.repo.ui.configbool("web", "allowpull", True)
                                         ignorewsamount=ignorewsamount,
                                         ignoreblanklines=ignoreblanklines), f, tn)
-                def changelog(self, pos):
+                def changelog(self, pos, shortlog=False):
                     def changenav(**map):
                         def seq(factor, maxchanges=None):
                             if maxchanges:
                         l = []
                         last = 0
-                        for f in seq(1, self.maxchanges):
+                        maxchanges = shortlog and self.maxshortchanges or self.maxchanges
-                            if f < self.maxchanges or f <= last:
+                        for f in seq(1, maxchanges):
+                            if f < maxchanges or f <= last:
                                 continue
                             if f > count:
                                 break
                         for e in l:
                             yield e
+                    maxchanges = shortlog and self.maxshortchanges or self.maxchanges
                     cl = self.repo.changelog
                     mf = cl.read(cl.tip())[0]
                     count = cl.count()
-                    start = max(0, pos - self.maxchanges + 1)
+                    start = max(0, pos - maxchanges + 1)
-                    end = min(count, start + self.maxchanges)
+                    end = min(count, start + maxchanges)
                     pos = end - 1
-                    yield self.t('changelog',
+                    yield self.t(shortlog and 'shortlog' or 'changelog',
                                  changenav=changenav,
                                  manifest=hex(mf),
                                  rev=pos, changesets=count, entries=changelist,
                             hn = hex(n)
                             yield self.t('searchentry',
-                                         parity=count & 1,
+                                         parity=self.stripes(count),
                                          author=changes[1],
                                          parent=self.siblings(cl.parents(n), cl.rev),
                                          child=self.siblings(cl.children(n), cl.rev),
                         for l, t in enumerate(text.splitlines(1)):
                             yield {"line": t,
                                    "linenumber": "% 6d" % (l + 1),
-                                   "parity": l & 1}
+                                   "parity": self.stripes(l)}
                     yield self.t("filerevision",
                                  file=f,
                     mfn = cs[0]
                     def annotate(**map):
-                        parity = 1
+                        parity = 0
                         last = None
                         for r, l in fl.annotate(n):
                             try:
                             yield {"file": full,
                                    "manifest": mnode,
                                    "filenode": hex(fnode),
-                                   "parity": parity,
+                                   "parity": self.stripes(parity),
                                    "basename": f,
                                    "permissions": mff[full]}
-                            parity = 1 - parity
+                            parity += 1
                     def dirlist(**map):
                         parity = 0
                             if fnode:
                                 continue
-                            yield {"parity": parity,
+                            yield {"parity": self.stripes(parity),
                                    "path": os.path.join(path, f),
                                    "manifest": mnode,
                                    "basename": f[:-1]}
-                            parity = 1 - parity
+                            parity += 1
                     yield self.t("manifest",
                                  manifest=mnode,
                         parity = 0
                         for k,n in i:
                             if notip and k == "tip": continue
-                            yield {"parity": parity,
+                            yield {"parity": self.stripes(parity),
                                    "tag": k,
                                    "tagmanifest": hex(cl.read(n)[0]),
                                    "date": cl.read(n)[2],
                                    "node": hex(n)}
-                            parity = 1 - parity
+                            parity += 1
                     yield self.t("tags",
                                  manifest=hex(mf),
                             t = c[2]
                             yield self.t("tagentry",
-                                         parity = parity,
+                                         parity = self.stripes(parity),
                                          tag = k,
                                          node = hex(n),
                                          date = t,
                                          tagmanifest = hex(m))
-                            parity = 1 - parity
+                            parity += 1
                     def changelist(**map):
                         parity = 0
                              lastchange = (0, 0), # FIXME
                              manifest = hex(mf),
                              tags = tagentries,
-                             shortlog = changelist)
+                             shortlog = changelist,
+                             archives=self.archivelist("tip"))
                 def filediff(self, file, changeset):
                     cl = self.repo.changelog
                     def expand_form(form):
                         shortcuts = {
                             'cl': [('cmd', ['changelog']), ('rev', None)],
+                            'sl': [('cmd', ['shortlog']), ('rev', None)],
                             'cs': [('cmd', ['changeset']), ('node', None)],
                             'f': [('cmd', ['file']), ('filenode', None)],
                             'fl': [('cmd', ['filelog']), ('filenode', None)],
                     else:
                         req.write(self.t("error"))
+                def stripes(self, parity):
+                    "make horizontal stripes for easier reading"
+                    if self.stripecount:
+                        return (1 + parity / self.stripecount) & 1
+                    else:
+                        return 0
                 def do_changelog(self, req):
                     hi = self.repo.changelog.count() - 1
                     if req.form.has_key('rev'):
                     req.write(self.changelog(hi))
+                def do_shortlog(self, req):
+                    hi = self.repo.changelog.count() - 1
+                    if req.form.has_key('rev'):
+                        hi = req.form['rev'][0]
+                        try:
+                            hi = self.repo.changelog.rev(self.repo.lookup(hi))
+                        except hg.RepoError:
+                            req.write(self.search(hi)) # XXX redirect to 404 page?
+                            return
+                    req.write(self.changelog(hi, shortlog = True))
                 def do_changeset(self, req):
                     req.write(self.changeset(req.form['node'][0]))
                     # require ssl by default, auth info cannot be sniffed and
                     # replayed
                     ssl_req = self.repo.ui.configbool('web', 'push_ssl', True)
-                    if ssl_req and not req.env.get('HTTPS'):
+                    if ssl_req:
-                        bail(_('ssl required\n'))
+                        if not req.env.get('HTTPS'):
-                        return
+                            bail(_('ssl required\n'))
+                            return
+                        proto = 'https'
+                    else:
+                        proto = 'http'
                     # do not allow push unless explicitly allowed
                     if not self.check_perm(req, 'push', False):
                             sys.stdout = cStringIO.StringIO()
                             try:
-                                ret = self.repo.addchangegroup(fp, 'serve')
+                                url = 'remote:%s:%s' % (proto,
+                                                        req.env.get('REMOTE_HOST', ''))
+                                ret = self.repo.addchangegroup(fp, 'serve', url)
                             finally:
                                 val = sys.stdout.getvalue()
                                 sys.stdout = old_stdout

mercurial/httprepo.py

0 +9 -5

             class httprepository(remoterepository):
                 def __init__(self, ui, path):
+                    self.path = path
                     self.caps = None
                     scheme, netloc, urlpath, query, frag = urlparse.urlsplit(path)
                     if query or frag:
                     host, port, user, passwd = netlocsplit(netloc)
                     # urllib cannot handle URLs with embedded user or passwd
-                    self.url = urlparse.urlunsplit((scheme, netlocunsplit(host, port),
+                    self._url = urlparse.urlunsplit((scheme, netlocunsplit(host, port),
-                                                    urlpath, '', ''))
+                                                     urlpath, '', ''))
                     self.ui = ui
                     proxyurl = ui.config("http_proxy", "host") or os.getenv('http_proxy')
                     opener.addheaders = [('User-agent', 'mercurial/proto-1.0')]
                     urllib2.install_opener(opener)
+                def url(self):
+                    return self.path
                 # look up capabilities only when needed
                 def get_caps(self):
                     q = {"cmd": cmd}
                     q.update(args)
                     qs = urllib.urlencode(q)
-                    cu = "%s?%s" % (self.url, qs)
+                    cu = "%s?%s" % (self._url, qs)
                     try:
                         resp = urllib2.urlopen(urllib2.Request(cu, data, headers))
                     except urllib2.HTTPError, inst:
                            not proto.startswith('text/plain') and \
                            not proto.startswith('application/hg-changegroup'):
                         raise hg.RepoError(_("'%s' does not appear to be an hg repository") %
-                                           self.url)
+                                           self._url)
                     if proto.startswith('application/mercurial'):
                         version = proto[22:]
                         if float(version) > 0.1:
                             raise hg.RepoError(_("'%s' uses newer protocol %s") %
-                                               (self.url, version))
+                                               (self._url, version))
                     return resp

mercurial/localrepo.py

0 +11 -7

                     self.dirstate = dirstate.dirstate(self.opener, self.ui, self.root)
+                def url(self):
+                    return 'file:' + self.root
                 def hook(self, name, throw=False, **args):
                     def callhook(hname, funcname):
                         '''call python hook. hook is callable object, looked up as
                         cg = remote.changegroup(fetch, 'pull')
                     else:
                         cg = remote.changegroupsubset(fetch, heads, 'pull')
-                    return self.addchangegroup(cg, 'pull')
+                    return self.addchangegroup(cg, 'pull', remote.url())
                 def push(self, remote, force=False, revs=None):
                     # there are two ways to push to remote repo:
                     ret = self.prepush(remote, force, revs)
                     if ret[0] is not None:
                         cg, remote_heads = ret
-                        return remote.addchangegroup(cg, 'push')
+                        return remote.addchangegroup(cg, 'push', self.url())
                     return ret[1]
                 def push_unbundle(self, remote, force, revs):
                     return util.chunkbuffer(gengroup())
-                def addchangegroup(self, source, srctype):
+                def addchangegroup(self, source, srctype, url):
                     """add changegroup to repo.
                     returns number of heads modified or added + 1."""
                     if not source:
                         return 0
-                    self.hook('prechangegroup', throw=True, source=srctype)
+                    self.hook('prechangegroup', throw=True, source=srctype, url=url)
                     changesets = files = revisions = 0
                     if changesets > 0:
                         self.hook('pretxnchangegroup', throw=True,
-                                  node=hex(self.changelog.node(cor+1)), source=srctype)
+                                  node=hex(self.changelog.node(cor+1)), source=srctype,
+                                  url=url)
                     tr.close()
                     if changesets > 0:
                         self.hook("changegroup", node=hex(self.changelog.node(cor+1)),
-                                  source=srctype)
+                                  source=srctype, url=url)
                         for i in range(cor + 1, cnr + 1):
                             self.hook("incoming", node=hex(self.changelog.node(i)),
-                                      source=srctype)
+                                      source=srctype, url=url)
                     return newheads - oldheads + 1

mercurial/sshrepo.py

0 +5 -2

             class sshrepository(remoterepository):
                 def __init__(self, ui, path, create=0):
-                    self.url = path
+                    self._url = path
                     self.ui = ui
                     m = re.match(r'ssh://(([^@]+)@)?([^:/]+)(:(\d+))?(/(.*))?', path)
                     self.validate_repo(ui, sshcmd, args, remotecmd)
+                def url(self):
+                    return self._url
                 def validate_repo(self, ui, sshcmd, args, remotecmd):
                     cmd = '%s %s "%s -R %s serve --stdio"'
                     cmd = cmd % (sshcmd, args, remotecmd, self.path)
                         return 1
                     return int(r)
-                def addchangegroup(self, cg, source):
+                def addchangegroup(self, cg, source, url):
                     d = self.call("addchangegroup")
                     if d:
                         raise hg.RepoError(_("push refused: %s") % d)

mercurial/sshserver.py

0 +6 -2

                         return
                     self.respond("")
-                    r = self.repo.addchangegroup(self.fin, 'serve')
+                    r = self.repo.addchangegroup(self.fin, 'serve', self.client_url())
                     self.respond(str(r))
+                def client_url(self):
+                    client = os.environ.get('SSH_CLIENT', '').split(' ', 1)[0]
+                    return 'remote:ssh:' + client
                 def do_unbundle(self):
                     their_heads = self.getarg()[1].split()
                             # push can proceed
                             fp.seek(0)
-                            r = self.repo.addchangegroup(fp, 'serve')
+                            r = self.repo.addchangegroup(fp, 'serve', self.client_url())
                             self.respond(str(r))
                         finally:
                             if not was_locked:

mercurial/statichttprepo.py

0 +4 0

             class statichttprepository(localrepo.localrepository):
                 def __init__(self, ui, path):
+                    self._url = path
                     self.path = (path + "/.hg")
                     self.ui = ui
                     self.revlogversion = 0
                     self.encodepats = None
                     self.decodepats = None
+                def url(self):
+                    return 'static-' + self._url
                 def dev(self):
                     return -1

templates/changelog-gitweb.tmpl

0 +1 -1

             </div>
             <div class="page_nav">
-            <a href="?cmd=summary;style=gitweb">summary</a> | changelog | <a href="?cmd=tags;style=gitweb">tags</a> | <a href="?cmd=manifest;manifest=#manifest#;path=/;style=gitweb">manifest</a><br/>
+            <a href="?cmd=summary;style=gitweb">summary</a> | <a href="?cmd=shortlog;rev=#rev#;style=gitweb">shortlog</a> | changelog | <a href="?cmd=tags;style=gitweb">tags</a> | <a href="?cmd=manifest;manifest=#manifest#;path=/;style=gitweb">manifest</a>#archives%archiveentry#<br/>
             <br/>
             #changenav%naventry#<br/>
             </div>

templates/changelog.tmpl

0 +1 0

             <body>
             <div class="buttons">
+            <a href="?sl=#rev#">shortlog</a>
             <a href="?cmd=tags">tags</a>
             <a href="?mf=#manifest|short#;path=/">manifest</a>
             #archives%archiveentry#

templates/changeset-gitweb.tmpl

0 +1 -1

             </div>
             <div class="page_nav">
-            <a href="?cmd=summary;style=gitweb">summary</a> | <a href="?cmd=changelog;rev=#rev#;style=gitweb">changelog</a> | <a href="?cmd=tags;style=gitweb">tags</a> | <a href="?cmd=manifest;manifest=#manifest#;path=/;style=gitweb">manifest</a> | changeset | <a href="?cmd=changeset;node=#node#;style=raw">raw</a> #archives%archiveentry#<br/>
+            <a href="?cmd=summary;style=gitweb">summary</a> | <a href="?cmd=shortlog;rev=#rev#;style=gitweb">shortlog</a> | <a href="?cmd=changelog;rev=#rev#;style=gitweb">changelog</a> | <a href="?cmd=tags;style=gitweb">tags</a> | <a href="?cmd=manifest;manifest=#manifest#;path=/;style=gitweb">manifest</a> | changeset | <a href="?cmd=changeset;node=#node#;style=raw">raw</a> #archives%archiveentry#<br/>
             </div>
             <div>

templates/changeset.tmpl

0 +1 0

             <div class="buttons">
             <a href="?cl=#rev#">changelog</a>
+            <a href="?sl=#rev#">shortlog</a>
             <a href="?cmd=tags">tags</a>
             <a href="?mf=#manifest|short#;path=/">manifest</a>
             <a href="?cs=#node|short#;style=raw">raw</a>

templates/error-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=/;style=gitweb">manifest</a><br/>
+            <a href="?cmd=summary;style=gitweb">summary</a> | <a href="?cmd=shortlog;style=gitweb">shortlog</a> | <a href="?cmd=changelog;style=gitweb">changelog</a> | <a href="?cmd=tags;style=gitweb">tags</a> | <a href="?cmd=manifest;manifest=#manifest#;path=/;style=gitweb">manifest</a><br/>
             </div>
             <div>

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 | <a href="?cmd=annotate;file=#file|urlescape#;filenode=#filenode#;style=raw">raw</a><br/>
+            <a href="?cmd=summary;style=gitweb">summary</a> | <a href="?cmd=shortlog;style=gitweb">shortlog</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

             <div class="buttons">
             <a href="?cl=#rev#">changelog</a>
+            <a href="?sl=#rev#">shortlog</a>
             <a href="?tags=">tags</a>
             <a href="?cs=#node|short#">changeset</a>
             <a href="?mf=#manifest|short#;path=#path|urlescape#">manifest</a>

templates/filediff.tmpl

0 +1 0

             <div class="buttons">
             <a href="?cl=#rev#">changelog</a>
+            <a href="?sl=#rev#">shortlog</a>
             <a href="?tags=">tags</a>
             <a href="?cs=#node|short#">changeset</a>
             <a href="?f=#filenode|short#;file=#file|urlescape#">file</a>

templates/filelog-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=file;file=#file|urlescape#;filenode=#filenode#;style=gitweb">file</a> | revisions | <a href="?cmd=annotate;file=#file|urlescape#;filenode=#filenode#;style=gitweb">annotate</a> | <a href="?fl=#filenode|short#;file=#file|urlescape#;style=rss">rss</a><br/>
+            <a href="?cmd=summary;style=gitweb">summary</a> | <a href="?cmd=shortlog;style=gitweb">shortlog</a> | <a href="?cmd=changelog;style=gitweb">changelog</a> | <a href="?cmd=tags;style=gitweb">tags</a> | <a href="?cmd=file;file=#file|urlescape#;filenode=#filenode#;style=gitweb">file</a> | revisions | <a href="?cmd=annotate;file=#file|urlescape#;filenode=#filenode#;style=gitweb">annotate</a> | <a href="?fl=#filenode|short#;file=#file|urlescape#;style=rss">rss</a><br/>
             </div>
             <div class="title" >#file|urlescape#</div>

templates/filelog.tmpl

0 +1 0

             <div class="buttons">
             <a href="?cl=tip">changelog</a>
+            <a href="?sl=tip">shortlog</a>
             <a href="?tags=">tags</a>
             <a href="?f=#filenode|short#;file=#file|urlescape#">file</a>
             <a href="?fa=#filenode|short#;file=#file|urlescape#">annotate</a>

templates/filerevision-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="?mf=#manifest|short#;path=#path|urlescape#;style=gitweb">manifest</a> | <a href="?cmd=changeset;node=#node#;style=gitweb">changeset</a> | file | <a href="?cmd=filelog;file=#file|urlescape#;filenode=#filenode#;style=gitweb">revisions</a> | <a href="?cmd=annotate;file=#file|urlescape#;filenode=#filenode#;style=gitweb">annotate</a> | <a href="?cmd=file;file=#file|urlescape#;filenode=#filenode#;style=raw">raw</a><br/>
+            <a href="?cmd=summary;style=gitweb">summary</a> | <a href="?cmd=shortlog;style=gitweb">shortlog</a> | <a href="?cmd=changelog;style=gitweb">changelog</a> | <a href="?cmd=tags;style=gitweb">tags</a> | <a href="?mf=#manifest|short#;path=#path|urlescape#;style=gitweb">manifest</a> | <a href="?cmd=changeset;node=#node#;style=gitweb">changeset</a> | file | <a href="?cmd=filelog;file=#file|urlescape#;filenode=#filenode#;style=gitweb">revisions</a> | <a href="?cmd=annotate;file=#file|urlescape#;filenode=#filenode#;style=gitweb">annotate</a> | <a href="?cmd=file;file=#file|urlescape#;filenode=#filenode#;style=raw">raw</a><br/>
             </div>
             <div class="title">#file|escape#</div>

templates/filerevision.tmpl

0 +1 0

             <div class="buttons">
             <a href="?cl=#rev#">changelog</a>
+            <a href="?sl=#rev#">shortlog</a>
             <a href="?tags=">tags</a>
             <a href="?cs=#node|short#">changeset</a>
             <a href="?mf=#manifest|short#;path=#path|urlescape#">manifest</a>

templates/manifest-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> | manifest | <a href="?cs=#node|short#;style=gitweb">changeset</a> #archives%archiveentry#<br/>
+            <a href="?cmd=summary;style=gitweb">summary</a> | <a href="?cmd=shortlog;style=gitweb">shortlog</a> | <a href="?cmd=changelog;style=gitweb">changelog</a> | <a href="?cmd=tags;style=gitweb">tags</a> | manifest | <a href="?cs=#node|short#;style=gitweb">changeset</a> #archives%archiveentry#<br/>
             </div>
             <div class="title" >#path|escape#</div>

templates/manifest.tmpl

0 +1 0

             <div class="buttons">
             <a href="?cl=#rev#">changelog</a>
+            <a href="?sl=#rev#">shortlog</a>
             <a href="?tags=">tags</a>
             <a href="?cs=#node|short#">changeset</a>
             #archives%archiveentry#

templates/map

0 +3 0

             footer = footer.tmpl
             search = search.tmpl
             changelog = changelog.tmpl
+            shortlog = shortlog.tmpl
+            shortlogentry = shortlogentry.tmpl
             naventry = '<a href="?cl=#rev#">#label|escape#</a> '
+            navshortentry = '<a href="?sl=#rev#">#label|escape#</a> '
             filedifflink = '<a href="?fd=#node|short#;file=#file|urlescape#">#file|escape#</a> '
             filenodelink = '<a href="?f=#filenode|short#;file=#file|urlescape#">#file|escape#</a> '
             fileellipses = '...'

templates/search-gitweb.tmpl

0 +1 -1

             #header#
             <div class="page_nav">
-            <a href="?cmd=summary;style=gitweb">summary</a> | log | <a href="?cmd=tags;style=gitweb">tags</a> | <a href="?cmd=manifest;manifest=#manifest#;path=/;style=gitweb">manifest</a><br/>
+            <a href="?cmd=summary;style=gitweb">summary</a> | <a href="?cmd=shortlog;style=gitweb">shortlog</a> | <a href="?cmd=changelog;style=gitweb">changelog</a> | <a href="?cmd=tags;style=gitweb">tags</a> | <a href="?cmd=manifest;manifest=#manifest#;path=/;style=gitweb">manifest</a><br/>
             </div>
             <h2>searching for #query|escape#</h2>

templates/search.tmpl

0 +1 0

             <div class="buttons">
             <a href="?cl=tip">changelog</a>
+            <a href="?sl=tip">shortlog</a>
             <a href="?tags=">tags</a>
             <a href="?mf=#manifest|short#;path=/">manifest</a>
             </div>

templates/shortlog-gitweb.tmpl

0 +22 -3

@@ -1,13 +1,32 b''
1	#header#	1	#header#
		2	<title>#repo\|escape#: Shortlog</title>
		3	<link rel="alternate" type="application/rss+xml"
		4	href="?cmd=changelog;style=rss" title="RSS feed for #repo\|escape#">
		5	</head>
		6	<body>
2		7
		8	<div class="page_header">
		9	<a href="http://www.selenic.com/mercurial/" title="Mercurial"><div style="float:right;">Mercurial</div></a><a href="?cmd=summary;style=gitweb">#repo\|escape#</a> / shortlog
		10	</div>
		11
		12	<form action="#">
		13	<div class="search">
		14	<input type="hidden" name="repo" value="#repo\|escape#" />
		15	<input type="hidden" name="style" value="gitweb" />
		16	<input type="hidden" name="cmd" value="changelog" />
		17	<input type="text" name="rev" />
		18	</div>
		19	</form>
		20	</div>
3	<div class="page_nav">	21	<div class="page_nav">
4	<a href="?cmd=summary;style=gitweb">summary</a> \| <a href="?cmd=changelog;style=gitweb">log</a> \| <a href="?cmd=tags;style=gitweb">tags</a> \| <a href="?cmd=manifest;manifest=#manifest#;path=/;style=gitweb">manifest</a><br/>	22	<a href="?cmd=summary;style=gitweb">summary</a> \| shortlog \| <a href="?cmd=changelog;rev=#rev#;style=gitweb">changelog</a> \| <a href="?cmd=tags;style=gitweb">tags</a> \| <a href="?cmd=manifest;manifest=#manifest#;path=/;style=gitweb">manifest</a>#archives%archiveentry#<br/>
		23	<br/>
5		24
6	#changenav%naventry#<br/>	25	#changenav%navshortentry#<br/>
7	</div>	26	</div>
8		27
9	<table cellspacing="0">	28	<table cellspacing="0">
10	#entries#	29	#entries%shortlogentry#
11	</table>	30	</table>
12		31
13	#footer#	32	#footer#

templates/static/style.css

0 +6 0

             .logEntry th.age, .logEntry th.firstline { font-weight: bold; }
             .logEntry th.firstline { text-align: left; width: inherit; }
+            /* Shortlog entries */
+            .slogEntry { width: 100%; font-size: smaller; }
+            .slogEntry .age { width: 7%; }
+            .slogEntry td { font-weight: normal; text-align: left; vertical-align: top; }
+            .slogEntry td.author { width: 35%; }
             /* Tag entries */
             #tagEntries { list-style: none; margin: 0; padding: 0; }
             #tagEntries .tagEntry { list-style: none; margin: 0; padding: 0; }

templates/summary-gitweb.tmpl

0 +2 -1

             <a href="http://www.selenic.com/mercurial/" title="Mercurial"><div style="float:right;">Mercurial</div></a><a href="?cmd=summary;style=gitweb">#repo|escape#</a> / summary
             </div>
             <div class="page_nav">
-            summary | <a href="?cmd=changelog;style=gitweb">changelog</a> | <a href="?cmd=tags;style=gitweb">tags</a> | <a href="?cmd=manifest;manifest=#manifest#;path=/;style=gitweb">manifest</a><br/>
+            summary | <a href="?cmd=shortlog;style=gitweb">shortlog</a> | <a href="?cmd=changelog;style=gitweb">changelog</a> | <a href="?cmd=tags;style=gitweb">tags</a> | <a href="?cmd=manifest;manifest=#manifest#;path=/;style=gitweb">manifest</a>#archives%archiveentry#
+            <br/>
             </div>
             <div class="title">&nbsp;</div>

templates/tags-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> | tags | <a href="?cmd=manifest;manifest=#manifest#;path=/;style=gitweb">manifest</a>
+            <a href="?cmd=summary;style=gitweb">summary</a> | <a href="?cmd=shortlog;style=gitweb">shortlog</a> | <a href="?cmd=changelog;style=gitweb">changelog</a> | tags | <a href="?cmd=manifest;manifest=#manifest#;path=/;style=gitweb">manifest</a>
             <br/>
             </div>

templates/tags.tmpl

0 +1 0

             <div class="buttons">
             <a href="?cl=tip">changelog</a>
+            <a href="?sl=tip">shortlog</a>
             <a href="?mf=#manifest|short#;path=/">manifest</a>
             <a type="application/rss+xml" href="?cmd=tags;style=rss">rss</a>
             </div>

tests/run-tests.py

0 +1 -1

             parser.add_option("-v", "--verbose", action="store_true",
                 help="output verbose messages")
             parser.add_option("-t", "--timeout", type="int",
-                help="output verbose messages")
+                help="kill errant tests after TIMEOUT seconds")
             parser.add_option("-c", "--cover", action="store_true",
                 help="print a test coverage report")
             parser.add_option("-s", "--cover_stdlib", action="store_true",

tests/test-bundle

0 +2 0

             hg init empty
             cd empty
             hg -R bundle://../full.hg log
+            echo '[hooks]' >> .hg/hgrc
+            echo 'changegroup = echo changegroup: u=$HG_URL' >> .hg/hgrc
             #doesn't work (yet ?)
             #hg -R bundle://../full.hg verify
             hg pull bundle://../full.hg

tests/test-bundle.out

0 +1 0

             date:        Mon Jan 12 13:46:40 1970 +0000
             summary:     0.0
+            changegroup: u=bundle:../full.hg
             pulling from bundle://../full.hg
             requesting all changes
             adding changesets

tests/test-hook

0 +3 -3

             # changegroup hooks can see env vars
             echo '[hooks]' > .hg/hgrc
-            echo 'prechangegroup = echo prechangegroup hook' >> .hg/hgrc
+            echo 'prechangegroup = echo prechangegroup hook: u=`echo $HG_URL | sed s,file:.*,file:,`' >> .hg/hgrc
-            echo 'changegroup = echo changegroup hook: n=$HG_NODE' >> .hg/hgrc
+            echo 'changegroup = echo changegroup hook: n=$HG_NODE u=`echo $HG_URL | sed s,file:.*,file:,`' >> .hg/hgrc
-            echo 'incoming = echo incoming hook: n=$HG_NODE' >> .hg/hgrc
+            echo 'incoming = echo incoming hook: n=$HG_NODE u=`echo $HG_URL | sed s,file:.*,file:,`' >> .hg/hgrc
             # pretxncommit and commit hooks can see both parents of merge
             cd ../a

tests/test-hook.out

0 +5 -5

 :4c52fb2e4022
             commit hook: n=4c52fb2e402287dd5dc052090682536c8406c321 p1=1324a5531bac09b329c3845d35ae6a7526874edb p2=b702efe9688826e3a91283852b328b84dbf37bc2
             commit hook b
-            prechangegroup hook
+            prechangegroup hook: u=file:
-            changegroup hook: n=b702efe9688826e3a91283852b328b84dbf37bc2
+            changegroup hook: n=b702efe9688826e3a91283852b328b84dbf37bc2 u=file:
-            incoming hook: n=b702efe9688826e3a91283852b328b84dbf37bc2
+            incoming hook: n=b702efe9688826e3a91283852b328b84dbf37bc2 u=file:
-            incoming hook: n=1324a5531bac09b329c3845d35ae6a7526874edb
+            incoming hook: n=1324a5531bac09b329c3845d35ae6a7526874edb u=file:
-            incoming hook: n=4c52fb2e402287dd5dc052090682536c8406c321
+            incoming hook: n=4c52fb2e402287dd5dc052090682536c8406c321 u=file:
             pulling from ../a
             searching for changes
             adding changesets

tests/test-http

0 +16 -7

             cd test
             echo foo>foo
             hg commit -A -d '0 0' -m 1
-            hg --config server.uncompressed=True serve -p 20059 -d --pid-file=hg1.pid
+            hg --config server.uncompressed=True serve -p 20059 -d --pid-file=../hg1.pid
-            cat hg1.pid >> $DAEMON_PIDS
+            hg serve -p 20060 -d --pid-file=../hg2.pid
-            hg serve -p 20060 -d --pid-file=hg2.pid
-            cat hg2.pid >> $DAEMON_PIDS
             cd ..
+            cat hg1.pid hg2.pid >> $DAEMON_PIDS
             echo % clone via stream
             http_proxy= hg clone --uncompressed http://localhost:20059/ copy 2>&1 | \
               sed -e 's/[0-9][0-9.]*/XXX/g'
-            cd copy
+            hg verify -R copy
-            hg verify
             echo % try to clone via stream, should use pull instead
             http_proxy= hg clone --uncompressed http://localhost:20060/ copy2
             echo % clone via pull
             http_proxy= hg clone http://localhost:20059/ copy-pull
+            hg verify -R copy-pull
+            cd test
+            echo bar > bar
+            hg commit -A -d '1 0' -m 2
+            cd ..
+            echo % pull
             cd copy-pull
-            hg verify
+            echo '[hooks]' >> .hg/hgrc
+            echo 'changegroup = echo changegroup: u=$HG_URL' >> .hg/hgrc
+            hg pull
+            cd ..

tests/test-http.out

0 +10 0

@@ -28,3 +28,13 b' checking manifests'
28	crosschecking files in changesets and manifests	28	crosschecking files in changesets and manifests
29	checking files	29	checking files
30	1 files, 1 changesets, 1 total revisions	30	1 files, 1 changesets, 1 total revisions
		31	adding bar
		32	% pull
		33	changegroup: u=http://localhost:20059/
		34	pulling from http://localhost:20059/
		35	searching for changes
		36	adding changesets
		37	adding manifests
		38	adding file changes
		39	added 1 changesets with 1 changes to 1 files
		40	(run 'hg update' to get a working copy)

tests/test-push-http

0 +6 0

             echo % expect success
             echo 'allow_push = *' >> .hg/hgrc
+            echo '[hooks]' >> .hg/hgrc
+            echo 'changegroup = echo changegroup: u=$HG_URL >> $HGTMP/urls' >> .hg/hgrc
             hg serve -p 20059 -d --pid-file=hg.pid
             cat hg.pid >> $DAEMON_PIDS
             hg --cwd ../test2 push http://localhost:20059/
             kill `cat hg.pid`
             hg rollback
+            sed 's/\(remote:http.*\):.*/\1/' $HGTMP/urls
             echo % expect authorization error: all users denied
+            echo '[web]' > .hg/hgrc
+            echo 'push_ssl = false' >> .hg/hgrc
             echo 'deny_push = *' >> .hg/hgrc
             hg serve -p 20059 -d --pid-file=hg.pid
             cat hg.pid >> $DAEMON_PIDS

tests/test-push-http.out

0 +1 0

             adding file changes
             added 1 changesets with 1 changes to 1 files
             rolling back last transaction
+            changegroup: u=remote:http
             % expect authorization error: all users denied
             pushing to http://localhost:20059/
             searching for changes

tests/test-ssh

0 +7 0

             	exit -1
             fi
+            SSH_CLIENT='127.0.0.1 1 2'
+            export SSH_CLIENT
             echo Got arguments 1:$1 2:$2 3:$3 4:$4 5:$5 >> dummylog
             $2
             EOF
             hg ci -A -m "init" -d "1000000 0" foo
             echo '[server]' > .hg/hgrc
             echo 'uncompressed = True' >> .hg/hgrc
+            echo '[hooks]' >> .hg/hgrc
+            echo 'changegroup = echo changegroup in remote: u=$HG_URL >> ../dummylog' >> .hg/hgrc
             cd ..
             cd local
             hg verify
+            echo '[hooks]' >> .hg/hgrc
+            echo 'changegroup = echo changegroup in local: u=$HG_URL >> ../dummylog' >> .hg/hgrc
             echo "# empty default pull"
             hg paths
             hg pull -e ../dummyssh

tests/test-ssh.out

0 +2 0

             Got arguments 1:user@dummy 2:hg -R remote serve --stdio 3: 4: 5:
             Got arguments 1:user@dummy 2:hg -R local serve --stdio 3: 4: 5:
             Got arguments 1:user@dummy 2:hg -R remote serve --stdio 3: 4: 5:
+            changegroup in remote: u=remote:ssh:127.0.0.1
             Got arguments 1:user@dummy 2:hg -R remote serve --stdio 3: 4: 5:
             Got arguments 1:user@dummy 2:hg -R remote serve --stdio 3: 4: 5:
+            changegroup in remote: u=remote:ssh:127.0.0.1

tests/test-static-http

0 +8 0

             cd local
             hg verify
             cat bar
+            cd ../remote
+            echo baz > quux
+            hg commit -A -mtest2 -d '100000000 0'
+            cd ../local
+            echo '[hooks]' >> .hg/hgrc
+            echo 'changegroup = echo changegroup: u=$HG_URL' >> .hg/hgrc
             http_proxy= hg pull
             kill $!

tests/test-static-http.out

0 +7 -1

@@ -19,6 +19,12 b' crosschecking files in changesets and ma'
19	checking files	19	checking files
20	1 files, 1 changesets, 1 total revisions	20	1 files, 1 changesets, 1 total revisions
21	foo	21	foo
		22	adding quux
		23	changegroup: u=static-http://localhost:20059/remote
22	pulling from static-http://localhost:20059/remote	24	pulling from static-http://localhost:20059/remote
23	searching for changes	25	searching for changes
24	no changes found	26	adding changesets
		27	adding manifests
		28	adding file changes
		29	added 1 changesets with 1 changes to 1 files
		30	(run 'hg update' to get a working copy)

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