--- a/doc/Makefile Sat Oct 24 00:44:57 2009 +0200
+++ b/doc/Makefile Sat Oct 24 00:47:49 2009 +0200
@@ -25,7 +25,8 @@
--strip-elements-with-class htmlonly $*.txt $*
%.html: %.txt common.txt
- $(RST2HTML) --halt warning $*.txt $*.html
+ $(RST2HTML) --halt warning \
+ --link-stylesheet --stylesheet-path style.css $*.txt $*.html
MANIFEST: man html
# tracked files are already in the main MANIFEST
--- a/doc/gendoc.py Sat Oct 24 00:44:57 2009 +0200
+++ b/doc/gendoc.py Sat Oct 24 00:47:49 2009 +0200
@@ -50,7 +50,7 @@
s += ' ' + attr[2]
else:
s = attr[2]
- d['synopsis'] = s
+ d['synopsis'] = s.strip()
return d
--- a/doc/hgignore.5.txt Sat Oct 24 00:44:57 2009 +0200
+++ b/doc/hgignore.5.txt Sat Oct 24 00:47:49 2009 +0200
@@ -43,14 +43,14 @@
"ui" section.
To control Mercurial's handling of files that it manages, see the
-|hg(1)|_ man page. Look for the "``-I``" and "``-X``" options.
+|hg(1)|_ man page. Look for the ``-I`` and ``-X`` options.
SYNTAX
------
An ignore file is a plain text file consisting of a list of patterns,
-with one pattern per line. Empty lines are skipped. The "``#``"
-character is treated as a comment character, and the "``\``" character
+with one pattern per line. Empty lines are skipped. The ``#``
+character is treated as a comment character, and the ``\`` character
is treated as an escape character.
Mercurial supports several pattern syntaxes. The default syntax used
@@ -71,9 +71,9 @@
follow, until another syntax is selected.
Neither glob nor regexp patterns are rooted. A glob-syntax pattern of
-the form "``*.c``" will match a file ending in "``.c``" in any directory,
-and a regexp pattern of the form "``\.c$``" will do the same. To root a
-regexp pattern, start it with "``^``".
+the form ``*.c`` will match a file ending in ``.c`` in any directory,
+and a regexp pattern of the form ``\.c$`` will do the same. To root a
+regexp pattern, start it with ``^``.
EXAMPLE
-------
--- a/doc/hgrc.5.txt Sat Oct 24 00:44:57 2009 +0200
+++ b/doc/hgrc.5.txt Sat Oct 24 00:47:49 2009 +0200
@@ -86,8 +86,8 @@
SYNTAX
------
-A configuration file consists of sections, led by a "``[section]``" header
-and followed by "``name: value``" entries; "``name=value``" is also accepted.
+A configuration file consists of sections, led by a ``[section]`` header
+and followed by ``name: value`` entries; ``name=value`` is also accepted.
::
@@ -101,15 +101,15 @@
Leading whitespace is removed from values. Empty lines are skipped.
-Lines beginning with "``#``" or "``;``" are ignored and may be used to provide
+Lines beginning with ``#`` or ``;`` are ignored and may be used to provide
comments.
-A line of the form "``%include file``" will include ``file`` into the
+A line of the form ``%include file`` will include ``file`` into the
current configuration file. The inclusion is recursive, which means
that included files can include other files. Filenames are relative to
the configuration file in which the ``%include`` directive is found.
-A line with "``%unset name``" will remove ``name`` from the current
+A line with ``%unset name`` will remove ``name`` from the current
section, if it has been set previously.
@@ -167,9 +167,9 @@
Supported arguments:
``prefix``
- Either "``*``" or a URI prefix with or without the scheme part.
+ Either ``*`` or a URI prefix with or without the scheme part.
The authentication entry with the longest matching prefix is used
- (where "``*``" matches everything and counts as a match of length
+ (where ``*`` matches everything and counts as a match of length
1). If the prefix doesn't include a scheme, the match is performed
against the URI with its scheme stripped as well, and the schemes
argument, q.v., is then subsequently consulted.
@@ -204,9 +204,9 @@
Filters consist of a filter pattern followed by a filter command.
Filter patterns are globs by default, rooted at the repository root.
-For example, to match any file ending in "``.txt``" in the root
-directory only, use the pattern "``*.txt``". To match any file ending
-in "``.c``" anywhere in the repository, use the pattern "``**.c``".
+For example, to match any file ending in ``.txt`` in the root
+directory only, use the pattern ``*.txt``. To match any file ending
+in ``.c`` anywhere in the repository, use the pattern ``**.c``.
The filter command can start with a specifier, either "pipe:" or
"tempfile:". If no specifier is given, "pipe:" is used by default.
@@ -259,6 +259,8 @@
``defaults``
""""""""""""
+(defaults are deprecated. Don't use them. Use aliases instead)
+
Use the [defaults] section to define command defaults, i.e. the
default options/arguments to pass to the specified commands.
@@ -349,16 +351,16 @@
enable an extension, create an entry for it in this section.
If you know that the extension is already in Python's search path,
-you can give the name of the module, followed by "``=``", with nothing
-after the "``=``".
+you can give the name of the module, followed by ``=``, with nothing
+after the ``=``.
-Otherwise, give a name that you choose, followed by "``=``", followed by
-the path to the "``.py``" file (including the file name extension) that
+Otherwise, give a name that you choose, followed by ``=``, followed by
+the path to the ``.py`` file (including the file name extension) that
defines the extension.
To explicitly disable an extension that is enabled in an hgrc of
-broader scope, prepend its path with "``!``", as in
-"``hgext.foo = !/ext/path``" or "``hgext.foo = !``" when path is not
+broader scope, prepend its path with ``!``, as in
+``hgext.foo = !/ext/path`` or ``hgext.foo = !`` when path is not
supplied.
Example for ``~/.hgrc``::
@@ -594,7 +596,7 @@
"ui"), a repository object (keyword "repo"), and a "hooktype"
keyword that tells what kind of hook is used. Arguments listed as
environment variables above are passed as keyword arguments, with no
-"``HG_``" prefix, and names in lower case.
+``HG_`` prefix, and names in lower case.
If a Python hook returns a "true" value or raises an exception, this
is treated as a failure.
@@ -719,7 +721,7 @@
This section specifies what users and groups are trusted. The
current user is always trusted. To trust everybody, list a user or a
-group with name "``*``".
+group with name ``*``.
``users``
Comma-separated list of trusted users.
@@ -755,7 +757,7 @@
in the same format as a repository-wide .hgignore file. This
option supports hook syntax, so if you want to specify multiple
ignore files, you can do so by setting something like
- "``ignore.other = ~/.hgignore2``". For details of the ignore file
+ ``ignore.other = ~/.hgignore2``. For details of the ignore file
format, see the |hgignore(5)|_ man page.
``interactive``
Allow to prompt the user. True or False. Default is True.
@@ -788,10 +790,10 @@
Warn if a ``.hg/hgrc`` file is ignored due to not being owned by a
trusted user or group. True or False. Default is True.
``slash``
- Display paths using a slash ("``/``") as the path separator. This
+ Display paths using a slash (``/``) as the path separator. This
only makes a difference on systems where the default path
separator is not the slash character (e.g. Windows uses the
- backslash character ("``\``")).
+ backslash character (``\``)).
Default is False.
``ssh``
command to use for SSH connections. Default is 'ssh'.
@@ -837,7 +839,7 @@
Whether to allow pulling from the repository. Default is true.
``allow_push``
Whether to allow pushing to the repository. If empty or not set,
- push is not allowed. If the special value "``*``", any remote user can
+ push is not allowed. If the special value ``*``, any remote user can
push, including unauthenticated users. Otherwise, the remote user
must have been authenticated, and the authenticated user name must
be present in this list (separated by whitespace or ","). The
@@ -850,7 +852,7 @@
user is unauthenticated or not present in the list (separated by
whitespace or ","), then access is denied for the user. If the
list is empty or not set, then access is permitted to all users by
- default. Setting allow_read to the special value "``*``" is equivalent
+ default. Setting allow_read to the special value ``*`` is equivalent
to it not being set (i.e. access is permitted to all users). The
contents of the allow_read list are examined after the deny_read
list.
@@ -866,7 +868,7 @@
Defaults to ui.username or ``$EMAIL`` or "unknown" if unset or empty.
``deny_push``
Whether to deny pushing to the repository. If empty or not set,
- push is not denied. If the special value "``*``", all remote users are
+ push is not denied. If the special value ``*``, all remote users are
denied push. Otherwise, unauthenticated users are all denied, and
any authenticated user name present in this list (separated by
whitespace or ",") is also denied. The contents of the deny_push
@@ -876,7 +878,7 @@
not empty, unauthenticated users are all denied, and any
authenticated user name present in this list (separated by
whitespace or ",") is also denied access to the repository. If set
- to the special value "``*``", all remote users are denied access
+ to the special value ``*``, all remote users are denied access
(rarely needed ;). If deny_read is empty or not set, the
determination of repository access depends on the presence and
content of the allow_read list (see description). If both
--- a/doc/rst2man.py Sat Oct 24 00:44:57 2009 +0200
+++ b/doc/rst2man.py Sat Oct 24 00:47:49 2009 +0200
@@ -212,12 +212,12 @@
'indent' : ('.INDENT %.1f\n', '.UNINDENT\n'),
'definition_list_item' : ('.TP', ''),
'field_name' : ('.TP\n.B ', '\n'),
- 'literal' : ('\\fC', '\\fP'),
+ 'literal' : ('\\fB', '\\fP'),
'literal_block' : ('.sp\n.nf\n.ft C\n', '\n.ft P\n.fi\n'),
'option_list_item' : ('.TP\n', ''),
- 'reference' : (r'\fI\%', r'\fP'),
+ 'reference' : (r'\%', r'\:'),
'emphasis': ('\\fI', '\\fP'),
'strong' : ('\\fB', '\\fP'),
'term' : ('\n.B ', '\n'),
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/style.css Sat Oct 24 00:47:49 2009 +0200
@@ -0,0 +1,353 @@
+
+body {
+ font-family: sans-serif;
+ /* adjustment for tt padding */
+ line-height: 140%;
+}
+
+tt, pre {
+ background-color: #EEE;
+ border: thin solid #CCC;
+ padding: 1px;
+}
+
+pre {
+ padding: 0.25em;
+}
+
+#contents tt, h2 tt {
+ background-color: inherit;
+ border: inherit;
+}
+
+/* styles taken from html4css1.css from Docutils, which is in the
+ public domain */
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+ border: 0;
+}
+
+table.borderless td, table.borderless th {
+ /* Override padding for "table.docutils td" with "! important".
+ The right padding separates the table cells. */
+ padding: 0 0.5em 0 0 ! important;
+}
+
+.first {
+ /* Override more specific margin styles with "! important". */
+ margin-top: 0 ! important;
+}
+
+.last, .with-subtitle {
+ margin-bottom: 0 ! important;
+}
+
+.hidden {
+ display: none;
+}
+
+a.toc-backref {
+ text-decoration: none;
+ color: black;
+}
+
+blockquote.epigraph {
+ margin: 2em 5em;;
+}
+
+dl.docutils dd {
+ margin-bottom: 0.5em;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+ font-weight: bold;
+}
+*/
+
+div.abstract {
+ margin: 2em 5em;
+}
+
+div.abstract p.topic-title {
+ font-weight: bold;
+ text-align: center;
+}
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+ margin: 2em;
+ border: medium outset;
+ padding: 1em;
+}
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+ font-weight: bold;
+ font-family: sans-serif;
+}
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title {
+ color: red;
+ font-weight: bold;
+ font-family: sans-serif;
+}
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+ compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+ margin-bottom: 0.5em;
+}
+
+div.compound .compound-last, div.compound .compound-middle {
+ margin-top: 0.5em;
+}
+*/
+
+div.dedication {
+ margin: 2em 5em;
+ text-align: center;
+ font-style: italic;
+}
+
+div.dedication p.topic-title {
+ font-weight: bold;
+ font-style: normal;
+}
+
+div.figure {
+ margin-left: 2em;
+ margin-right: 2em;
+}
+
+div.footer, div.header {
+ clear: both;
+ font-size: smaller;
+}
+
+div.line-block {
+ display: block;
+ margin-top: 1em;
+ margin-bottom: 1em;
+}
+
+div.line-block div.line-block {
+ margin-top: 0;
+ margin-bottom: 0;
+ margin-left: 1.5em;
+}
+
+div.sidebar {
+ margin: 0 0 0.5em 1em;
+ border: medium outset;
+ padding: 1em;
+ background-color: #ffffee;
+ width: 40%;
+ float: right;
+ clear: right;
+}
+
+div.sidebar p.rubric {
+ font-family: sans-serif;
+ font-size: medium;
+}
+
+div.system-messages {
+ margin: 5em;
+}
+
+div.system-messages h1 {
+ color: red;
+}
+
+div.system-message {
+ border: medium outset;
+ padding: 1em;
+}
+
+div.system-message p.system-message-title {
+ color: red;
+ font-weight: bold;
+}
+
+div.topic {
+ margin: 2em;
+}
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+ margin-top: 0.4em;
+}
+
+h1.title {
+ text-align: center;
+}
+
+h2.subtitle {
+ text-align: center;
+}
+
+hr.docutils {
+ width: 75%;
+}
+
+img.align-left {
+ clear: left;
+}
+
+img.align-right {
+ clear: right;
+}
+
+ol.simple, ul.simple {
+ margin-bottom: 1em;
+}
+
+ol.arabic {
+ list-style: decimal;
+}
+
+ol.loweralpha {
+ list-style: lower-alpha;
+}
+
+ol.upperalpha {
+ list-style: upper-alpha;
+}
+
+ol.lowerroman {
+ list-style: lower-roman;
+}
+
+ol.upperroman {
+ list-style: upper-roman;
+}
+
+p.attribution {
+ text-align: right;
+ margin-left: 50%;
+}
+
+p.caption {
+ font-style: italic;
+}
+
+p.credits {
+ font-style: italic;
+ font-size: smaller;
+}
+
+p.label {
+ white-space: nowrap;
+}
+
+p.rubric {
+ font-weight: bold;
+ font-size: larger;
+ color: maroon;
+ text-align: center;
+}
+
+p.sidebar-title {
+ font-family: sans-serif;
+ font-weight: bold;
+ font-size: larger;
+}
+
+p.sidebar-subtitle {
+ font-family: sans-serif;
+ font-weight: bold;
+}
+
+p.topic-title {
+ font-weight: bold;
+}
+
+pre.address {
+ margin-bottom: 0;
+ margin-top: 0;
+ font-family: serif;
+ font-size: 100%;
+}
+
+pre.literal-block, pre.doctest-block {
+ margin-left: 2em;
+ margin-right: 2em;
+}
+
+span.classifier {
+ font-family: sans-serif;
+ font-style: oblique;
+}
+
+span.classifier-delimiter {
+ font-family: sans-serif;
+ font-weight: bold;
+}
+
+span.interpreted {
+ font-family: sans-serif;
+}
+
+span.option {
+ white-space: nowrap;
+}
+
+span.pre {
+ white-space: pre;
+}
+
+span.problematic {
+ color: red;
+}
+
+span.section-subtitle {
+ /* font-size relative to parent (h1..h6 element) */
+ font-size: 80%;
+}
+
+table.citation {
+ border-left: solid 1px gray;
+ margin-left: 1px;
+}
+
+table.docinfo {
+ margin: 2em 4em;
+}
+
+table.docutils {
+ margin-top: 0.5em;
+ margin-bottom: 0.5em;
+}
+
+table.footnote {
+ border-left: solid 1px black;
+ margin-left: 1px;
+}
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+ padding-left: 0.5em;
+ padding-right: 0.5em;
+ vertical-align: top;
+}
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+ font-weight: bold;
+ text-align: left;
+ white-space: nowrap;
+ padding-left: 0;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+ font-size: 100%;
+}
+
+ul.auto-toc {
+ list-style-type: none;
+}
--- a/help/patterns.txt Sat Oct 24 00:44:57 2009 +0200
+++ b/help/patterns.txt Sat Oct 24 00:47:49 2009 +0200
@@ -7,17 +7,17 @@
Alternate pattern notations must be specified explicitly.
To use a plain path name without any pattern matching, start it with
-"path:". These path names must completely match starting at the
+``path:``. These path names must completely match starting at the
current repository root.
-To use an extended glob, start a name with "glob:". Globs are rooted
-at the current directory; a glob such as "``*.c``" will only match
-files in the current directory ending with ".c".
+To use an extended glob, start a name with ``glob:``. Globs are rooted
+at the current directory; a glob such as ``*.c`` will only match files
+in the current directory ending with ``.c``.
-The supported glob syntax extensions are "``**``" to match any string
-across path separators and "{a,b}" to mean "a or b".
+The supported glob syntax extensions are ``**`` to match any string
+across path separators and ``{a,b}`` to mean "a or b".
-To use a Perl/Python regular expression, start a name with "re:".
+To use a Perl/Python regular expression, start a name with ``re:``.
Regexp pattern matching is anchored at the root of the repository.
Plain examples::
--- a/hgext/graphlog.py Sat Oct 24 00:44:57 2009 +0200
+++ b/hgext/graphlog.py Sat Oct 24 00:47:49 2009 +0200
@@ -100,13 +100,17 @@
line.extend(["|", " "] * (n_columns - ni - 1))
return line
-def ascii(ui, base, type, char, text, coldata):
+def asciistate():
+ """returns the initial value for the "state" argument to ascii()"""
+ return [0, 0]
+
+def ascii(ui, state, type, char, text, coldata):
"""prints an ASCII graph of the DAG
takes the following arguments (one call per node in the graph):
- ui to write to
- - A list we can keep the needed state in
+ - Somewhere to keep the needed state in (init to asciistate())
- Column of the current node in the set of ongoing edges.
- Type indicator of node data == ASCIIDATA.
- Payload: (char, lines):
@@ -156,8 +160,8 @@
nodeline.extend([char, " "])
nodeline.extend(
- get_nodeline_edges_tail(idx, base[1], ncols, coldiff,
- base[0], fix_nodeline_tail))
+ get_nodeline_edges_tail(idx, state[1], ncols, coldiff,
+ state[0], fix_nodeline_tail))
# shift_interline is the line containing the non-vertical
# edges between this entry and the next
@@ -199,8 +203,8 @@
ui.write(ln.rstrip() + '\n')
# ... and start over
- base[0] = coldiff
- base[1] = idx
+ state[0] = coldiff
+ state[1] = idx
def get_revs(repo, rev_opt):
if rev_opt:
@@ -217,12 +221,12 @@
raise util.Abort(_("--graph option is incompatible with --%s") % op)
def generate(ui, dag, displayer, showparents, edgefn):
- seen, base = [], [0, 0]
+ seen, state = [], asciistate()
for rev, type, ctx, parents in dag:
char = ctx.node() in showparents and '@' or 'o'
displayer.show(ctx)
lines = displayer.hunk.pop(rev).split('\n')[:-1]
- ascii(ui, base, type, char, lines, edgefn(seen, rev, parents))
+ ascii(ui, state, type, char, lines, edgefn(seen, rev, parents))
def graphlog(ui, repo, path=None, **opts):
"""show revision history alongside an ASCII revision graph
--- a/hgext/patchbomb.py Sat Oct 24 00:44:57 2009 +0200
+++ b/hgext/patchbomb.py Sat Oct 24 00:47:49 2009 +0200
@@ -76,9 +76,11 @@
from mercurial.i18n import _
from mercurial.node import bin
-def prompt(ui, prompt, default=None, rest=': ', empty_ok=False):
+def prompt(ui, prompt, default='', rest=': ', empty_ok=False):
if not ui.interactive():
- return default
+ if default or empty_ok:
+ return default
+ raise util.Abort(_("%sPlease enter a valid value" % (prompt+rest)))
if default:
prompt += ' [%s]' % default
prompt += rest
@@ -331,8 +333,7 @@
subj = '[PATCH %0*d of %d %s] ' % (tlen, 0, len(patches), flag)
else:
subj = '[PATCH %0*d of %d] ' % (tlen, 0, len(patches))
- subj += opts.get('subject') or prompt(ui, 'Subject:', rest=subj,
- default='None')
+ subj += opts.get('subject') or prompt(ui, 'Subject:', rest=subj)
body = ''
if opts.get('diffstat'):
--- a/mercurial/archival.py Sat Oct 24 00:44:57 2009 +0200
+++ b/mercurial/archival.py Sat Oct 24 00:47:49 2009 +0200
@@ -7,6 +7,7 @@
from i18n import _
from node import hex
+import cmdutil
import util
import cStringIO, os, stat, tarfile, time, zipfile
import zlib, gzip
@@ -217,9 +218,25 @@
archiver = archivers[kind](dest, prefix, mtime or ctx.date()[0])
if repo.ui.configbool("ui", "archivemeta", True):
- write('.hg_archival.txt', 0644, False,
- lambda: 'repo: %s\nnode: %s\n' % (
- hex(repo.changelog.node(0)), hex(node)))
+ def metadata():
+ base = 'repo: %s\nnode: %s\nbranch: %s\n' % (
+ hex(repo.changelog.node(0)), hex(node), ctx.branch())
+
+ tags = ''.join('tag: %s\n' % t for t in ctx.tags()
+ if repo.tagtype(t) == 'global')
+ if not tags:
+ repo.ui.pushbuffer()
+ opts = {'template': '{latesttag}\n{latesttagdistance}',
+ 'style': '', 'patch': None, 'git': None}
+ cmdutil.show_changeset(repo.ui, repo, opts).show(ctx)
+ ltags, dist = repo.ui.popbuffer().split('\n')
+ tags = ''.join('latesttag: %s\n' % t for t in ltags.split(':'))
+ tags += 'latesttagdistance: %s\n' % dist
+
+ return base + tags
+
+ write('.hg_archival.txt', 0644, False, metadata)
+
for f in ctx:
ff = ctx.flags(f)
write(f, 'x' in ff and 0755 or 0644, 'l' in ff, ctx[f].data)
--- a/mercurial/commands.py Sat Oct 24 00:44:57 2009 +0200
+++ b/mercurial/commands.py Sat Oct 24 00:47:49 2009 +0200
@@ -2877,11 +2877,14 @@
if f in copy:
ui.write(' %s%s' % (repo.pathto(copy[f], cwd), end))
-def summary(ui, repo):
+def summary(ui, repo, **opts):
"""summarize working directory state
This generates a brief summary of the working directory state,
including parents, branch, commit status, and available updates.
+
+ With the --remote option, this will check the default paths for
+ incoming and outgoing changes. This can be time-consuming.
"""
ctx = repo[None]
@@ -2891,8 +2894,14 @@
for p in parents:
t = ' '.join([t for t in tags if tags[t] == p.node()])
+ if p.rev() == -1:
+ if not len(repo):
+ t += _(' (empty repository)')
+ else:
+ t += _(' (no revision checked out)')
ui.write(_('parent: %d:%s %s\n') % (p.rev(), str(p), t))
- ui.status(' ' + p.description().splitlines()[0].strip() + '\n')
+ if p.description():
+ ui.status(' ' + p.description().splitlines()[0].strip() + '\n')
branch = ctx.branch()
bheads = repo.branchheads(branch)
@@ -2901,11 +2910,13 @@
st = list(repo.status(unknown=True))[:7]
ms = merge_.mergestate(repo)
st.append([f for f in ms if f == 'u'])
- labels = _('modified added removed deleted unknown ignored unresolved')
+ labels = [_('%d modified'), _('%d added'), _('%d removed'),
+ _('%d deleted'), _('%d unknown'), _('%d ignored'),
+ _('%d unresolved')]
t = []
- for i,l in enumerate(labels.split()):
- if st[i]:
- t.append('%d %s' % (len(st[i]), l))
+ for s,l in zip(st, labels):
+ if s:
+ t.append(l % len(s))
t = ', '.join(t)
@@ -2918,7 +2929,10 @@
elif pnode not in bheads:
t += _(' (new branch head)')
- ui.write(_('commit: %s\n') % t.strip())
+ if 'clean' in t:
+ ui.status(_('commit: %s\n') % t.strip())
+ else:
+ ui.write(_('commit: %s\n') % t.strip())
# all ancestors of branch heads - all ancestors of parent = new csets
new = [0] * len(repo)
@@ -2930,13 +2944,41 @@
new = sum(new)
if new == 0:
- ui.write(_('update: (current)\n'))
+ ui.status(_('update: (current)\n'))
elif pnode not in bheads:
ui.write(_('update: %d new changesets (update)\n') % new)
else:
ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
(new, len(bheads)))
+ if opts.get('remote'):
+ t = []
+ source, revs, checkout = hg.parseurl(ui.expandpath('default'),
+ opts.get('rev'))
+ other = hg.repository(cmdutil.remoteui(repo, {}), source)
+ ui.debug('comparing with %s\n' % url.hidepassword(source))
+ repo.ui.pushbuffer()
+ common, incoming, rheads = repo.findcommonincoming(other)
+ repo.ui.popbuffer()
+ if incoming:
+ t.append(_('1 or more incoming'))
+
+ dest, revs, checkout = hg.parseurl(
+ ui.expandpath('default-push', 'default'))
+ other = hg.repository(cmdutil.remoteui(repo, {}), dest)
+ ui.debug('comparing with %s\n' % url.hidepassword(dest))
+ repo.ui.pushbuffer()
+ o = repo.findoutgoing(other)
+ repo.ui.popbuffer()
+ o = repo.changelog.nodesbetween(o, revs)[0]
+ if o:
+ t.append(_('%d outgoing') % len(o))
+
+ if t:
+ ui.write(_('remote: %s\n') % (', '.join(t)))
+ else:
+ ui.status(_('remote: (synced)\n'))
+
def tag(ui, repo, name1, *names, **opts):
"""add one or more tags for the current or given revision
@@ -3328,7 +3370,7 @@
] + walkopts + dryrunopts,
_('[OPTION]... [SOURCE]... DEST')),
"debugancestor": (debugancestor, [], _('[INDEX] REV1 REV2')),
- "debugcheckstate": (debugcheckstate, []),
+ "debugcheckstate": (debugcheckstate, [], ''),
"debugcommands": (debugcommands, [], _('[COMMAND]')),
"debugcomplete":
(debugcomplete,
@@ -3342,7 +3384,7 @@
"debugfsinfo": (debugfsinfo, [], _('[PATH]')),
"debugindex": (debugindex, [], _('FILE')),
"debugindexdot": (debugindexdot, [], _('FILE')),
- "debuginstall": (debuginstall, []),
+ "debuginstall": (debuginstall, [], ''),
"debugrebuildstate":
(debugrebuildstate,
[('r', 'rev', '', _('revision to rebuild to'))],
@@ -3488,7 +3530,7 @@
('n', 'newest-first', None, _('show newest record first')),
] + logopts + remoteopts,
_('[-M] [-p] [-n] [-f] [-r REV]... [DEST]')),
- "^parents":
+ "parents":
(parents,
[('r', 'rev', '', _('show parents from the specified revision')),
] + templateopts,
@@ -3569,7 +3611,8 @@
[('u', 'untrusted', None, _('show untrusted configuration options'))],
_('[-u] [NAME]...')),
"^summary|sum":
- (summary, []),
+ (summary,
+ [('', 'remote', None, _('check for push and pull'))], '[--remote]'),
"^status|st":
(status,
[('A', 'all', None, _('show status of all files')),
@@ -3597,7 +3640,7 @@
('m', 'message', '', _('use <text> as commit message')),
] + commitopts2,
_('[-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...')),
- "tags": (tags, []),
+ "tags": (tags, [], ''),
"tip":
(tip,
[('p', 'patch', None, _('show patch')),
--- a/mercurial/dirstate.py Sat Oct 24 00:44:57 2009 +0200
+++ b/mercurial/dirstate.py Sat Oct 24 00:47:49 2009 +0200
@@ -100,7 +100,7 @@
files = [self._join('.hgignore')]
for name, path in self._ui.configitems("ui"):
if name == 'ignore' or name.startswith('ignore.'):
- files.append(os.path.expanduser(path))
+ files.append(util.expandpath(path))
return ignore.ignore(self._root, files, self._ui.warn)
@propertycache
--- a/mercurial/dispatch.py Sat Oct 24 00:44:57 2009 +0200
+++ b/mercurial/dispatch.py Sat Oct 24 00:47:49 2009 +0200
@@ -248,7 +248,7 @@
args = aliasargs(i[0]) + args
defaults = ui.config("defaults", cmd)
if defaults:
- args = shlex.split(defaults) + args
+ args = map(util.expandpath, shlex.split(defaults)) + args
c = list(i[1])
else:
cmd = None
@@ -477,8 +477,7 @@
output = ui.config('profiling', 'output')
if output:
- path = os.path.expanduser(output)
- path = ui.expandpath(path)
+ path = ui.expandpath(output)
ostream = open(path, 'wb')
else:
ostream = sys.stderr
--- a/mercurial/extensions.py Sat Oct 24 00:44:57 2009 +0200
+++ b/mercurial/extensions.py Sat Oct 24 00:47:49 2009 +0200
@@ -30,7 +30,7 @@
def loadpath(path, module_name):
module_name = module_name.replace('.', '_')
- path = os.path.expanduser(path)
+ path = util.expandpath(path)
if os.path.isdir(path):
# module/__init__.py style
d, f = os.path.split(path.rstrip('/'))
--- a/mercurial/hg.py Sat Oct 24 00:44:57 2009 +0200
+++ b/mercurial/hg.py Sat Oct 24 00:47:49 2009 +0200
@@ -307,7 +307,6 @@
dest_repo.ui.setconfig('paths', 'default', abspath)
if update:
- dest_repo.ui.status(_("updating working directory\n"))
if update is not True:
checkout = update
for test in (checkout, 'default', 'tip'):
@@ -318,6 +317,8 @@
break
except error.RepoLookupError:
continue
+ bn = dest_repo[uprev].branch()
+ dest_repo.ui.status(_("updating to branch %s\n") % bn)
_update(dest_repo, uprev)
return src_repo, dest_repo
--- a/mercurial/minirst.py Sat Oct 24 00:44:57 2009 +0200
+++ b/mercurial/minirst.py Sat Oct 24 00:47:49 2009 +0200
@@ -260,6 +260,13 @@
return blocks
+def inlineliterals(blocks):
+ for b in blocks:
+ if b['type'] == 'paragraph':
+ b['lines'] = [l.replace('``', '"') for l in b['lines']]
+ return blocks
+
+
def addmargins(blocks):
"""Adds empty blocks for vertical spacing.
@@ -316,6 +323,7 @@
for b in blocks:
b['indent'] += indent
blocks = findliteralblocks(blocks)
+ blocks = inlineliterals(blocks)
blocks = findsections(blocks)
blocks = findbulletlists(blocks)
blocks = findoptionlists(blocks)
--- a/mercurial/ui.py Sat Oct 24 00:44:57 2009 +0200
+++ b/mercurial/ui.py Sat Oct 24 00:47:49 2009 +0200
@@ -179,7 +179,7 @@
user = os.environ.get("EMAIL")
if user is None and self.configbool("ui", "askusername"):
user = self.prompt(_("enter a commit username:"), default=None)
- if user is None:
+ if user is None and not self.interactive():
try:
user = '%s@%s' % (util.getuser(), socket.getfqdn())
self.warn(_("No username found, using '%s' instead\n") % user)
@@ -198,10 +198,12 @@
def _path(self, loc):
p = self.config('paths', loc)
- if p and '%%' in p:
- self.warn("(deprecated '%%' in path %s=%s from %s)\n" %
- (loc, p, self.configsource('paths', loc)))
- p = p.replace('%%', '%')
+ if p:
+ if '%%' in p:
+ self.warn("(deprecated '%%' in path %s=%s from %s)\n" %
+ (loc, p, self.configsource('paths', loc)))
+ p = p.replace('%%', '%')
+ p = util.expandpath(p)
return p
def expandpath(self, loc, default=None):
--- a/mercurial/util.py Sat Oct 24 00:44:57 2009 +0200
+++ b/mercurial/util.py Sat Oct 24 00:47:49 2009 +0200
@@ -335,7 +335,8 @@
elif main_is_frozen():
set_hgexecutable(sys.executable)
else:
- set_hgexecutable(find_exe('hg') or 'hg')
+ exe = find_exe('hg') or os.path.basename(sys.argv[0])
+ set_hgexecutable(exe)
return _hgexecutable
def set_hgexecutable(path):
@@ -1158,6 +1159,7 @@
_rcpath = []
for p in os.environ['HGRCPATH'].split(os.pathsep):
if not p: continue
+ p = expandpath(p)
if os.path.isdir(p):
for f, kind in osutil.listdir(p):
if f.endswith('.rc'):
@@ -1250,3 +1252,6 @@
for chunk in iterator:
for line in chunk.splitlines():
yield line
+
+def expandpath(path):
+ return os.path.expanduser(os.path.expandvars(path))
--- a/setup.py Sat Oct 24 00:44:57 2009 +0200
+++ b/setup.py Sat Oct 24 00:47:49 2009 +0200
@@ -97,7 +97,21 @@
except ImportError:
pass
-version = None
+def runcmd(cmd):
+ p = subprocess.Popen(cmd, stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE, env=env)
+ out, err = p.communicate()
+ # If root is executing setup.py, but the repository is owned by
+ # another user (as in "sudo python setup.py install") we will get
+ # trust warnings since the .hg/hgrc file is untrusted. That is
+ # fine, we don't want to load it anyway.
+ err = [e for e in err.splitlines()
+ if not e.startswith('Not trusting file')]
+ if err:
+ return ''
+ return out
+
+version = ''
if os.path.isdir('.hg'):
# Execute hg out of this directory with a custom environment which
@@ -113,34 +127,28 @@
# error 0xc0150004. See: http://bugs.python.org/issue3440
env['SystemRoot'] = os.environ['SystemRoot']
cmd = [sys.executable, 'hg', 'id', '-i', '-t']
-
- p = subprocess.Popen(cmd, stdout=subprocess.PIPE,
- stderr=subprocess.PIPE, env=env)
- out, err = p.communicate()
-
- # If root is executing setup.py, but the repository is owned by
- # another user (as in "sudo python setup.py install") we will get
- # trust warnings since the .hg/hgrc file is untrusted. That is
- # fine, we don't want to load it anyway.
- err = [e for e in err.splitlines()
- if not e.startswith('Not trusting file')]
- if err:
- sys.stderr.write('warning: could not establish Mercurial '
- 'version:\n%s\n' % '\n'.join(err))
+ l = runcmd(cmd).split()
+ while len(l) > 1 and l[-1][0].isalpha(): # remove non-numbered tags
+ l.pop()
+ if len(l) > 1: # tag found
+ version = l[-1]
+ if l[0].endswith('+'): # propagate the dirty status to the tag
+ version += '+'
+ elif len(l) == 1: # no tag found
+ cmd = [sys.executable, 'hg', 'parents', '--template',
+ '{latesttag}+{latesttagdistance}-']
+ version = runcmd(cmd) + l[0]
+ if version.endswith('+'):
+ version += time.strftime('%Y%m%d')
+elif os.path.exists('.hg_archival.txt'):
+ kw = dict([t.strip() for t in l.split(':', 1)]
+ for l in open('.hg_archival.txt'))
+ if 'tag' in kw:
+ version = kw['tag']
+ elif 'latesttag' in kw:
+ version = '%(latesttag)s+%(latesttagdistance)s-%(node).12s' % kw
else:
- l = out.split()
- while len(l) > 1 and l[-1][0].isalpha(): # remove non-numbered tags
- l.pop()
- if l:
- version = l[-1] # latest tag or revision number
- if version.endswith('+'):
- version += time.strftime('%Y%m%d')
-elif os.path.exists('.hg_archival.txt'):
- hgarchival = open('.hg_archival.txt')
- for line in hgarchival:
- if line.startswith('node:'):
- version = line.split(':')[1].strip()[:12]
- break
+ version = kw.get('node', '')[:12]
if version:
f = open("mercurial/__version__.py", "w")
--- a/tests/test-acl.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-acl.out Sat Oct 24 00:47:49 2009 +0200
@@ -4,7 +4,7 @@
adding manifests
adding file changes
added 1 changesets with 3 changes to 3 files
-updating working directory
+updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
Extension disabled for lack of a hook
--- a/tests/test-archive Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-archive Sat Oct 24 00:47:49 2009 +0200
@@ -108,6 +108,14 @@
echo 'rev-0.tar created'
fi
+echo '% test .hg_archival.txt'
+hg archive ../test-tags
+cat ../test-tags/.hg_archival.txt
+hg tag -r 2 mytag
+hg tag -r 2 anothertag
+hg archive -r 2 ../test-lasttag
+cat ../test-lasttag/.hg_archival.txt
+
hg archive -t bogus test.bogus
echo % server errors
--- a/tests/test-archive.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-archive.out Sat Oct 24 00:47:49 2009 +0200
@@ -57,6 +57,17 @@
test-TIP/baz/bletch
test-TIP/foo
rev-0.tar created
+% test .hg_archival.txt
+repo: daa7f7c60e0a224faa4ff77ca41b2760562af264
+node: 2c0277f05ed49d1c8328fb9ba92fba7a5ebcb33e
+branch: default
+latesttag: null
+latesttagdistance: 3
+repo: daa7f7c60e0a224faa4ff77ca41b2760562af264
+node: 2c0277f05ed49d1c8328fb9ba92fba7a5ebcb33e
+branch: default
+tag: anothertag
+tag: mytag
abort: unknown archive type 'bogus'
% server errors
% empty repo
--- a/tests/test-bundle-r.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-bundle-r.out Sat Oct 24 00:47:49 2009 +0200
@@ -163,7 +163,7 @@
6 changesets found
1 changesets found
1 changesets found
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% 2
2:d62976ca1e50
@@ -219,7 +219,7 @@
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
7 changesets found
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding changesets
adding manifests
--- a/tests/test-bundle.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-bundle.out Sat Oct 24 00:47:49 2009 +0200
@@ -146,9 +146,9 @@
adding manifests
adding file changes
added 4 changesets with 4 changes to 1 files
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
====== Log -R full.hg in partial
changeset: 8:836ac62537ab
@@ -269,7 +269,7 @@
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
changeset: 8:836ac62537ab
tag: tip
@@ -296,7 +296,7 @@
added 1 changesets with 1 changes to 1 files
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
====== test for 540d1059c802
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
searching for changes
1 changesets found
--- a/tests/test-clone-pull-corruption.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-clone-pull-corruption.out Sat Oct 24 00:47:49 2009 +0200
@@ -1,4 +1,4 @@
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
pulling from ../source
transaction abort!
--- a/tests/test-clone-r.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-clone-r.out Sat Oct 24 00:47:49 2009 +0200
@@ -30,7 +30,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
@@ -42,7 +42,7 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
@@ -54,7 +54,7 @@
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
@@ -66,7 +66,7 @@
adding manifests
adding file changes
added 4 changesets with 4 changes to 1 files
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
@@ -78,7 +78,7 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
@@ -90,7 +90,7 @@
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
@@ -102,7 +102,7 @@
adding manifests
adding file changes
added 4 changesets with 5 changes to 2 files
-updating working directory
+updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
@@ -114,7 +114,7 @@
adding manifests
adding file changes
added 5 changesets with 6 changes to 3 files
-updating working directory
+updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
@@ -126,7 +126,7 @@
adding manifests
adding file changes
added 5 changesets with 5 changes to 2 files
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
--- a/tests/test-clone.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-clone.out Sat Oct 24 00:47:49 2009 +0200
@@ -6,7 +6,7 @@
.hg/store/data/b.i
% default operation
-updating working directory
+updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
a
checking changesets
@@ -25,13 +25,13 @@
% default destination
destination directory: a
-updating working directory
+updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
a
% check that we drop the file:// from the path before
% writing the .hgrc
-updating working directory
+updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
% check that path aliases are expanded
@@ -43,7 +43,7 @@
adding manifests
adding file changes
added 11 changesets with 11 changes to 2 files
-updating working directory
+updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
@@ -52,5 +52,5 @@
2 files, 11 changesets, 11 total revisions
% clone to .
-updating working directory
+updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-convert-splicemap.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-convert-splicemap.out Sat Oct 24 00:47:49 2009 +0200
@@ -7,7 +7,7 @@
% test invalid splicemap
abort: syntax error in splicemap(1): key/value pair expected
% splice repo2 on repo1
-updating working directory
+updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
scanning source...
sorting...
--- a/tests/test-debugcomplete.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-debugcomplete.out Sat Oct 24 00:47:49 2009 +0200
@@ -173,13 +173,12 @@
init: ssh, remotecmd
log: follow, follow-first, date, copies, keyword, rev, removed, only-merges, user, only-branch, prune, patch, git, limit, no-merges, style, template, include, exclude
merge: force, rev, preview
-parents: rev, style, template
pull: update, force, rev, ssh, remotecmd
push: force, rev, ssh, remotecmd
remove: after, force, include, exclude
serve: accesslog, daemon, daemon-pipefds, errorlog, port, address, prefix, name, webdir-conf, pid-file, stdio, templates, style, ipv6, certificate
status: all, modified, added, removed, deleted, clean, unknown, ignored, no-status, copies, print0, rev, include, exclude
-summary:
+summary: remote
update: clean, check, date, rev
addremove: similarity, include, exclude, dry-run
archive: no-decode, prefix, rev, type, include, exclude
@@ -215,6 +214,7 @@
locate: rev, print0, fullpath, include, exclude
manifest: rev
outgoing: force, rev, newest-first, patch, git, limit, no-merges, style, template, ssh, remotecmd
+parents: rev, style, template
paths:
recover:
rename: after, force, include, exclude, dry-run
--- a/tests/test-default-push.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-default-push.out Sat Oct 24 00:47:49 2009 +0200
@@ -1,7 +1,7 @@
adding a
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% push should push to default when default-push not set
pushing
--- a/tests/test-empty-group.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-empty-group.out Sat Oct 24 00:47:49 2009 +0200
@@ -16,14 +16,14 @@
adding manifests
adding file changes
added 4 changesets with 3 changes to 3 files
-updating working directory
+updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
requesting all changes
adding changesets
adding manifests
adding file changes
added 4 changesets with 3 changes to 3 files
-updating working directory
+updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
comparing with b
searching for changes
--- a/tests/test-empty.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-empty.out Sat Oct 24 00:47:49 2009 +0200
@@ -6,7 +6,7 @@
00changelog.i
requires
store
-updating working directory
+updating to branch default
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
--- a/tests/test-extension.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-extension.out Sat Oct 24 00:47:49 2009 +0200
@@ -7,7 +7,7 @@
ui == repo.ui
reposetup called for b
ui == repo.ui
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
uisetup called
Bar
--- a/tests/test-fetch.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-fetch.out Sat Oct 24 00:47:49 2009 +0200
@@ -1,8 +1,8 @@
% test fetch with default branches only
adding a
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
1:97d72e5f12c7
@@ -16,9 +16,9 @@
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1:97d72e5f12c7
adding c
-updating working directory
+updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-updating working directory
+updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
% should merge c into a
pulling from ../a
@@ -61,9 +61,9 @@
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
new changeset 3:... merges remote changes with local
Automated merge with http://localhost:20059/
-updating working directory
+updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-updating working directory
+updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding f
adding g
@@ -89,9 +89,9 @@
created new head
% pull in change on foreign branch
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -105,9 +105,9 @@
2
% pull in changes on both foreign and local branches
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -124,9 +124,9 @@
% pull changes on foreign (2 new heads) and local (1 new head) branches
% with a local change
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -149,9 +149,9 @@
7
% pull in changes on foreign (merge of local branch) and local (2 new
% heads) with a local change
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -172,7 +172,7 @@
3
% pull in change on different branch than dirstate
adding a
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
marked working directory as branch topic
abort: working dir not at branch tip (use "hg update" to check out branch tip)
@@ -184,7 +184,7 @@
adding b
marked working directory as branch default
adding c
-updating working directory
+updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
% fetch should succeed
pulling from ../ib1
@@ -192,7 +192,7 @@
no changes found
% test issue1726
adding a
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
pulling from ../i1726r1
searching for changes
--- a/tests/test-filebranch.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-filebranch.out Sat Oct 24 00:47:49 2009 +0200
@@ -1,5 +1,5 @@
creating base
-updating working directory
+updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
creating branch a
creating branch b
--- a/tests/test-flags.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-flags.out Sat Oct 24 00:47:49 2009 +0200
@@ -1,4 +1,4 @@
-updating working directory
+updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
pulling from ../test1
requesting all changes
--- a/tests/test-globalopts.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-globalopts.out Sat Oct 24 00:47:49 2009 +0200
@@ -1,6 +1,6 @@
adding a
adding b
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
pulling from ../b
searching for changes
--- a/tests/test-help.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-help.out Sat Oct 24 00:47:49 2009 +0200
@@ -12,7 +12,6 @@
init create a new repository in the given directory
log show revision history of entire repository or files
merge merge working directory with another revision
- parents show the parents of the working directory or revision
pull pull changes from the specified source
push push changes to the specified destination
remove remove the specified files on the next commit
@@ -32,7 +31,6 @@
init create a new repository in the given directory
log show revision history of entire repository or files
merge merge working directory with another revision
- parents show the parents of the working directory or revision
pull pull changes from the specified source
push push changes to the specified destination
remove remove the specified files on the next commit
@@ -317,7 +315,6 @@
init create a new repository in the given directory
log show revision history of entire repository or files
merge merge working directory with another revision
- parents show the parents of the working directory or revision
pull pull changes from the specified source
push push changes to the specified destination
remove remove the specified files on the next commit
@@ -342,7 +339,6 @@
init create a new repository in the given directory
log show revision history of entire repository or files
merge merge working directory with another revision
- parents show the parents of the working directory or revision
pull pull changes from the specified source
push push changes to the specified destination
remove remove the specified files on the next commit
--- a/tests/test-hgrc.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-hgrc.out Sat Oct 24 00:47:49 2009 +0200
@@ -1,5 +1,5 @@
hg: config error at .../t/.hg/hgrc:1: 'invalid'
-updating working directory
+updating to branch default
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
[paths]
default = .../foo%bar
--- a/tests/test-hook.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-hook.out Sat Oct 24 00:47:49 2009 +0200
@@ -3,7 +3,7 @@
0:29b62aeb769f
commit hook: HG_NODE=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b HG_PARENT1=0000000000000000000000000000000000000000
commit.b hook: HG_NODE=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b HG_PARENT1=0000000000000000000000000000000000000000
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
precommit hook: HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b
pretxncommit hook: HG_NODE=b702efe9688826e3a91283852b328b84dbf37bc2 HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b HG_PENDING=$HGTMP/test-hook/a
@@ -109,7 +109,7 @@
abort: preoutgoing.forbid hook exited with status 1
preoutgoing hook: HG_SOURCE=clone
outgoing hook: HG_NODE=0000000000000000000000000000000000000000 HG_SOURCE=clone
-updating working directory
+updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
preoutgoing hook: HG_SOURCE=clone
preoutgoing.forbid hook: HG_SOURCE=clone
--- a/tests/test-http-clone-r.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-http-clone-r.out Sat Oct 24 00:47:49 2009 +0200
@@ -33,7 +33,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
@@ -45,7 +45,7 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
@@ -57,7 +57,7 @@
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
@@ -69,7 +69,7 @@
adding manifests
adding file changes
added 4 changesets with 4 changes to 1 files
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
@@ -81,7 +81,7 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
@@ -93,7 +93,7 @@
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
@@ -105,7 +105,7 @@
adding manifests
adding file changes
added 4 changesets with 5 changes to 2 files
-updating working directory
+updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
@@ -117,7 +117,7 @@
adding manifests
adding file changes
added 5 changesets with 6 changes to 3 files
-updating working directory
+updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
@@ -129,7 +129,7 @@
adding manifests
adding file changes
added 5 changesets with 5 changes to 2 files
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
--- a/tests/test-http-proxy.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-http-proxy.out Sat Oct 24 00:47:49 2009 +0200
@@ -3,7 +3,7 @@
streaming all changes
XXX files to transfer, XXX bytes of data
transferred XXX bytes in XXX seconds (XXX XB/sec)
-updating working directory
+updating to branch default
XXX files updated, XXX files merged, XXX files removed, XXX files unresolved
checking changesets
checking manifests
@@ -16,7 +16,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
@@ -29,7 +29,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
%% proxy url with user name and password
requesting all changes
@@ -37,7 +37,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
%% url with user name and password
requesting all changes
@@ -45,7 +45,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
%% bad host:port for proxy
abort: error: Connection refused
@@ -55,7 +55,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
XXX "GET http://localhost:/?pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000&cmd=between HTTP/1.1" - -
XXX "GET http://localhost:/?cmd=capabilities HTTP/1.1" - -
--- a/tests/test-http.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-http.out Sat Oct 24 00:47:49 2009 +0200
@@ -7,7 +7,7 @@
streaming all changes
XXX files to transfer, XXX bytes of data
transferred XXX bytes in XXX seconds (XXX XB/sec)
-updating working directory
+updating to branch default
XXX files updated, XXX files merged, XXX files removed, XXX files unresolved
checking changesets
checking manifests
@@ -20,7 +20,7 @@
adding manifests
adding file changes
added 1 changesets with 4 changes to 4 files
-updating working directory
+updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
% clone via pull
requesting all changes
@@ -28,7 +28,7 @@
adding manifests
adding file changes
added 1 changesets with 4 changes to 4 files
-updating working directory
+updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
--- a/tests/test-import.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-import.out Sat Oct 24 00:47:49 2009 +0200
@@ -6,7 +6,7 @@
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
-updating working directory
+updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
applying ../tip.patch
% message should be same
@@ -19,7 +19,7 @@
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
-updating working directory
+updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
applying ../tip.patch
line2
@@ -29,7 +29,7 @@
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
-updating working directory
+updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
applying ../tip.patch
abort: empty commit message
@@ -39,7 +39,7 @@
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
-updating working directory
+updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
applying ../tip.patch
% import of plain diff with specific date and user
@@ -48,7 +48,7 @@
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
-updating working directory
+updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
applying ../tip.patch
changeset: 1:ca68f19f3a40
@@ -73,7 +73,7 @@
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
-updating working directory
+updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
applying ../tip.patch
diff -r 80971e65b431 a
@@ -88,7 +88,7 @@
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
-updating working directory
+updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
applying tip.patch
% import from stdin
@@ -97,7 +97,7 @@
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
-updating working directory
+updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
applying patch from stdin
% override commit message
@@ -106,7 +106,7 @@
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
-updating working directory
+updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
applying patch from stdin
summary: override
@@ -116,7 +116,7 @@
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
-updating working directory
+updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
applying ../msg.patch
user: email patcher
@@ -127,7 +127,7 @@
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
-updating working directory
+updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
applying patch from stdin
% plain diff in email, subject, no message body
@@ -136,7 +136,7 @@
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
-updating working directory
+updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
applying patch from stdin
% plain diff in email, no subject, no message body, should fail
@@ -145,7 +145,7 @@
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
-updating working directory
+updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
applying patch from stdin
abort: empty commit message
@@ -155,7 +155,7 @@
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
-updating working directory
+updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
applying patch from stdin
summary: second change
@@ -165,7 +165,7 @@
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
-updating working directory
+updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
applying patch from stdin
email patch
@@ -184,7 +184,7 @@
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
-updating working directory
+updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
applying ../../../tip.patch
% message should be 'subdir change'
--- a/tests/test-incoming-outgoing.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-incoming-outgoing.out Sat Oct 24 00:47:49 2009 +0200
@@ -305,7 +305,7 @@
date: Mon Jan 12 13:46:40 1970 +0000
summary: 8
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
--- a/tests/test-issue1306.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-issue1306.out Sat Oct 24 00:47:49 2009 +0200
@@ -26,7 +26,7 @@
adding manifests
adding file changes
added 3 changesets with 2 changes to 2 files
-updating working directory
+updating to branch br
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
changeset: 2:1630aed6ed2b
branch: br
@@ -41,7 +41,7 @@
adding manifests
adding file changes
added 3 changesets with 2 changes to 2 files
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
changeset: 0:cb9a9f314b8b
user: test
@@ -54,7 +54,7 @@
adding manifests
adding file changes
added 3 changesets with 2 changes to 2 files
-updating working directory
+updating to branch br
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
changeset: 1:234f53e6c5ff
branch: br
--- a/tests/test-keyword.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-keyword.out Sat Oct 24 00:47:49 2009 +0200
@@ -280,7 +280,7 @@
adding manifests
adding file changes
added 2 changesets with 3 changes to 3 files
-updating working directory
+updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
% incoming
comparing with test-keyword/Test
--- a/tests/test-lock-badness.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-lock-badness.out Sat Oct 24 00:47:49 2009 +0200
@@ -1,5 +1,5 @@
adding a
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
pushing to ../a
--- a/tests/test-manifest-merging.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-manifest-merging.out Sat Oct 24 00:47:49 2009 +0200
@@ -2,7 +2,7 @@
% create alpha in first repo
adding alpha
% clone foo-base to foo-work
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% create beta in second repo
adding beta
--- a/tests/test-merge10.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-merge10.out Sat Oct 24 00:47:49 2009 +0200
@@ -1,4 +1,4 @@
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
pulling from ../a
searching for changes
--- a/tests/test-merge6.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-merge6.out Sat Oct 24 00:47:49 2009 +0200
@@ -1,8 +1,8 @@
-updating working directory
+updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-updating working directory
+updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
pulling from ../B1
searching for changes
--- a/tests/test-merge7.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-merge7.out Sat Oct 24 00:47:49 2009 +0200
@@ -1,4 +1,4 @@
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
pulling from ../test-a
searching for changes
--- a/tests/test-merge8.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-merge8.out Sat Oct 24 00:47:49 2009 +0200
@@ -1,4 +1,4 @@
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
pulling from ../a
searching for changes
--- a/tests/test-mq-pull-from-bundle.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-mq-pull-from-bundle.out Sat Oct 24 00:47:49 2009 +0200
@@ -18,7 +18,7 @@
====== Bundle queue
1 changesets found
====== Clone base
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
====== Incoming queue bundle
>> hg -R .hg/patches incoming ../queue.hgq
@@ -41,7 +41,7 @@
>> hg qseries
two.patch
====== Clone base again
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
====== Unbundle queue bundle
>> hg -R .hg/patches unbundle --update ../queue.hgq
--- a/tests/test-mq-qclone-http.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-mq-qclone-http.out Sat Oct 24 00:47:49 2009 +0200
@@ -20,7 +20,7 @@
adding manifests
adding file changes
added 1 changesets with 3 changes to 3 files
-updating working directory
+updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
a
@@ -45,7 +45,7 @@
adding manifests
adding file changes
added 1 changesets with 3 changes to 3 files
-updating working directory
+updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
a
@@ -70,7 +70,7 @@
adding manifests
adding file changes
added 1 changesets with 3 changes to 3 files
-updating working directory
+updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
a
--- a/tests/test-mq.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-mq.out Sat Oct 24 00:47:49 2009 +0200
@@ -56,7 +56,7 @@
use "hg -v help mq" to show aliases and global options
adding a
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b/z
% qinit
@@ -520,7 +520,7 @@
rev 0: add foo
patch repo:
rev 0: checkpoint
-updating working directory
+updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
main repo:
@@ -533,7 +533,7 @@
rev 0: add foo
patch repo:
rev 0: checkpoint
-updating working directory
+updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
main repo:
--- a/tests/test-mv-cp-st-diff.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-mv-cp-st-diff.out Sat Oct 24 00:47:49 2009 +0200
@@ -1,4 +1,4 @@
-updating working directory
+updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
** rename in working dir **
@@ -120,7 +120,7 @@
+y1
-updating working directory
+updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
** copy in working dir **
@@ -259,7 +259,7 @@
+y1
-updating working directory
+updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
** single rename **
@@ -396,7 +396,7 @@
+y1
-updating working directory
+updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
** single copy **
@@ -568,7 +568,7 @@
+y1
-updating working directory
+updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
** rename chain **
@@ -694,7 +694,7 @@
+y1
-updating working directory
+updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
** copy chain **
@@ -937,7 +937,7 @@
+y1
-updating working directory
+updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
** circular rename **
@@ -1061,7 +1061,7 @@
+y1
-updating working directory
+updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
moving x/x to y/x
--- a/tests/test-notify-changegroup.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-notify-changegroup.out Sat Oct 24 00:47:49 2009 +0200
@@ -1,5 +1,5 @@
% clone
-updating working directory
+updating to branch default
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
% commit
adding a
--- a/tests/test-notify.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-notify.out Sat Oct 24 00:47:49 2009 +0200
@@ -61,7 +61,7 @@
% commit
adding a
% clone
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% commit
% pull (minimal config)
--- a/tests/test-patch.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-patch.out Sat Oct 24 00:47:49 2009 +0200
@@ -5,7 +5,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
applying ../a.diff
Using custom patch
--- a/tests/test-patchbomb Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-patchbomb Sat Oct 24 00:47:49 2009 +0200
@@ -152,6 +152,9 @@
hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar --in-reply-to baz \
-r 0:1 | fixheaders
+hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar --in-reply-to baz \
+ -s test -r 0:1 | fixheaders
+
echo "% test single flag for single patch"
hg email --date '1970-1-1 0:1' -n --flag fooFlag -f quux -t foo -c bar -s test \
-r 2 | fixheaders
--- a/tests/test-patchbomb.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-patchbomb.out Sat Oct 24 00:47:49 2009 +0200
@@ -1177,17 +1177,20 @@
+ff2c9fa2018b15fa74b33363bda9527323e2a99f two
+ff2c9fa2018b15fa74b33363bda9527323e2a99f two.diff
+abort: Subject:[PATCH 0 of 2] Please enter a valid value
+This patch series consists of 2 patches.
+
This patch series consists of 2 patches.
Write the introductory message for the patch series.
-Displaying [PATCH 0 of 2] None ...
+Displaying [PATCH 0 of 2] test ...
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
-Subject: [PATCH 0 of 2] None
+Subject: [PATCH 0 of 2] test
Message-Id: <patchbomb.60@
In-Reply-To: <baz>
References: <baz>
--- a/tests/test-paths.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-paths.out Sat Oct 24 00:47:49 2009 +0200
@@ -1,2 +1,2 @@
-updating working directory
+updating to branch default
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-pull-http.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-pull-http.out Sat Oct 24 00:47:49 2009 +0200
@@ -1,5 +1,5 @@
adding a
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% expect error, cloning not allowed
abort: authorization failed
--- a/tests/test-pull-permission.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-pull-permission.out Sat Oct 24 00:47:49 2009 +0200
@@ -3,7 +3,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
--- a/tests/test-pull-pull-corruption.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-pull-pull-corruption.out Sat Oct 24 00:47:49 2009 +0200
@@ -3,7 +3,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
pulling from ../source2
pulling from ../source1
--- a/tests/test-pull-update.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-pull-update.out Sat Oct 24 00:47:49 2009 +0200
@@ -1,5 +1,5 @@
adding foo
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% should fail
pulling from ../tt
--- a/tests/test-pull.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-pull.out Sat Oct 24 00:47:49 2009 +0200
@@ -9,7 +9,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
--- a/tests/test-push-hook-lock.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-push-hook-lock.out Sat Oct 24 00:47:49 2009 +0200
@@ -1,7 +1,7 @@
adding foo
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
pushing to ../2
searching for changes
--- a/tests/test-push-http.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-push-http.out Sat Oct 24 00:47:49 2009 +0200
@@ -1,5 +1,5 @@
adding a
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% expect ssl error
pushing to http://localhost/
--- a/tests/test-push-warn Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-push-warn Sat Oct 24 00:47:49 2009 +0200
@@ -125,19 +125,19 @@
echo % checking prepush logic does not allow silently pushing multiple new heads
cd ..
-hg init g
-echo init > g/init
-hg -R g ci -Am init
-echo a > g/a
-hg -R g ci -Am a
-hg clone g h
-hg -R g up 0
-echo b > g/b
-hg -R g ci -Am b
+hg init h
+echo init > h/init
+hg -R h ci -Am init
+echo a > h/a
+hg -R h ci -Am a
+hg clone h i
hg -R h up 0
-echo c > h/c
-hg -R h ci -Am c
-hg -R h push g
+echo b > h/b
+hg -R h ci -Am b
+hg -R i up 0
+echo c > i/c
+hg -R i ci -Am c
+hg -R i push h
echo
exit 0
--- a/tests/test-push-warn.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-push-warn.out Sat Oct 24 00:47:49 2009 +0200
@@ -1,4 +1,4 @@
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
pushing to ../a
searching for changes
@@ -24,7 +24,7 @@
adding file changes
added 2 changesets with 1 changes to 1 files
adding foo
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
@@ -125,18 +125,17 @@
added 2 changesets with 2 changes to 1 files
0
% checking prepush logic does not allow silently pushing multiple new heads
-abort: repository g already exists!
adding init
adding a
-updating working directory
-3 files updated, 0 files merged, 0 files removed, 0 files unresolved
-1 files updated, 0 files merged, 2 files removed, 0 files unresolved
+updating to branch default
+2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+0 files updated, 0 files merged, 1 files removed, 0 files unresolved
adding b
created new head
-1 files updated, 0 files merged, 2 files removed, 0 files unresolved
+0 files updated, 0 files merged, 1 files removed, 0 files unresolved
adding c
created new head
-pushing to g
+pushing to h
searching for changes
abort: push creates new remote heads!
(did you forget to merge? use push -f to force)
--- a/tests/test-qrecord.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-qrecord.out Sat Oct 24 00:47:49 2009 +0200
@@ -14,7 +14,6 @@
init create a new repository in the given directory
log show revision history of entire repository or files
merge merge working directory with another revision
- parents show the parents of the working directory or revision
pull pull changes from the specified source
push push changes to the specified destination
remove remove the specified files on the next commit
--- a/tests/test-rebase-pull.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-rebase-pull.out Sat Oct 24 00:47:49 2009 +0200
@@ -1,6 +1,6 @@
-updating working directory
+updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-updating working directory
+updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
% Now b has one revision to be pulled from a
--- a/tests/test-rename-after-merge.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-rename-after-merge.out Sat Oct 24 00:47:49 2009 +0200
@@ -1,7 +1,7 @@
% create source repository
adding a
% fork source repository
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
% update source repository
--- a/tests/test-rename-dir-merge2.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-rename-dir-merge2.out Sat Oct 24 00:47:49 2009 +0200
@@ -1,5 +1,5 @@
adding a/f
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
moving a/f to b/f
adding a/aa/g
--- a/tests/test-revlog-group-emptyiter.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-revlog-group-emptyiter.out Sat Oct 24 00:47:49 2009 +0200
@@ -1,7 +1,7 @@
# -- setting up base repo
adding a
# -- cloning base repo
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
# -- setting up cset to push
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-simple-update.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-simple-update.out Sat Oct 24 00:47:49 2009 +0200
@@ -4,7 +4,7 @@
crosschecking files in changesets and manifests
checking files
1 files, 1 changesets, 1 total revisions
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
pulling from ../branch
--- a/tests/test-ssh-clone-r.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-ssh-clone-r.out Sat Oct 24 00:47:49 2009 +0200
@@ -32,7 +32,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
@@ -44,7 +44,7 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
@@ -56,7 +56,7 @@
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
@@ -68,7 +68,7 @@
adding manifests
adding file changes
added 4 changesets with 4 changes to 1 files
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
@@ -80,7 +80,7 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
@@ -92,7 +92,7 @@
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
@@ -104,7 +104,7 @@
adding manifests
adding file changes
added 4 changesets with 5 changes to 2 files
-updating working directory
+updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
@@ -116,7 +116,7 @@
adding manifests
adding file changes
added 5 changesets with 6 changes to 3 files
-updating working directory
+updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
@@ -128,7 +128,7 @@
adding manifests
adding file changes
added 5 changesets with 5 changes to 2 files
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
--- a/tests/test-ssh.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-ssh.out Sat Oct 24 00:47:49 2009 +0200
@@ -6,7 +6,7 @@
streaming all changes
XXX files to transfer, XXX bytes of data
transferred XXX bytes in XXX seconds (XXX XB/sec)
-updating working directory
+updating to branch default
XXX files updated, XXX files merged, XXX files removed, XXX files unresolved
checking changesets
checking manifests
@@ -19,7 +19,7 @@
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
-updating working directory
+updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
# verify
checking changesets
--- a/tests/test-static-http.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-static-http.out Sat Oct 24 00:47:49 2009 +0200
@@ -12,7 +12,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
@@ -39,7 +39,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
@@ -50,7 +50,7 @@
default = static-http://localhost/
% test with empty repo (issue965)
no changes found
-updating working directory
+updating to branch default
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
--- a/tests/test-strict.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-strict.out Sat Oct 24 00:47:49 2009 +0200
@@ -15,7 +15,6 @@
init create a new repository in the given directory
log show revision history of entire repository or files
merge merge working directory with another revision
- parents show the parents of the working directory or revision
pull pull changes from the specified source
push push changes to the specified destination
remove remove the specified files on the next commit
--- a/tests/test-subrepo.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-subrepo.out Sat Oct 24 00:47:49 2009 +0200
@@ -97,7 +97,7 @@
t3
>>>>>>> other
% clone
-updating working directory
+updating to branch default
pulling subrepo s
requesting all changes
adding changesets
--- a/tests/test-symlink-os-yes-fs-no.py.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-symlink-os-yes-fs-no.py.out Sat Oct 24 00:47:49 2009 +0200
@@ -3,5 +3,5 @@
adding manifests
adding file changes
added 1 changesets with 4 changes to 4 files
-updating working directory
+updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-symlinks.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-symlinks.out Sat Oct 24 00:47:49 2009 +0200
@@ -19,7 +19,7 @@
? a/b/c/demo
adding a/b/c/demo
2. clone it
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
# git symlink diff
diff --git a/a/b/c/demo b/a/b/c/demo
--- a/tests/test-transplant.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-transplant.out Sat Oct 24 00:47:49 2009 +0200
@@ -10,7 +10,7 @@
2 0:17ab29e464c6 b1
1 r2
0 r1
-updating working directory
+updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 3 files removed, 0 files unresolved
% rebase b onto r1
@@ -28,7 +28,7 @@
2 0:17ab29e464c6 b1
1 r2
0 r1
-updating working directory
+updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 3 files removed, 0 files unresolved
% rebase b onto r1, skipping b2
@@ -49,7 +49,7 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
-updating working directory
+updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
searching for changes
applying 37a1297eb21b
@@ -75,7 +75,7 @@
0 r1
% skip local changes transplanted to the source
adding b4
-updating working directory
+updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
searching for changes
applying 4333daefcb15
@@ -86,7 +86,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
searching for changes
searching for changes
--- a/tests/test-up-local-change.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-up-local-change.out Sat Oct 24 00:47:49 2009 +0200
@@ -1,5 +1,5 @@
adding a
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff -r 33aaa84a386b a
--- a/tests/test-url-rev.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-url-rev.out Sat Oct 24 00:47:49 2009 +0200
@@ -5,7 +5,7 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
-updating working directory
+updating to branch foo
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% heads
changeset: 1:cd2a86ecc814
--- a/tests/test-win32text.out Sat Oct 24 00:44:57 2009 +0200
+++ b/tests/test-win32text.out Sat Oct 24 00:47:49 2009 +0200
@@ -4,7 +4,7 @@
commit should succeed
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
commit should fail
Attempt to commit or push text file(s) using CRLF line endings
@@ -113,7 +113,7 @@
-updating working directory
+updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding dupe/a