--- a/contrib/mergetools.hgrc Mon Sep 10 09:40:42 2012 +0200
+++ b/contrib/mergetools.hgrc Tue Sep 11 10:56:23 2012 -0300
@@ -16,6 +16,7 @@
gvimdiff.priority=-9
vimdiff.args=$local $other $base
+vimdiff.check=changed
vimdiff.priority=-10
merge.checkconflicts=True
--- a/contrib/wix/guids.wxi Mon Sep 10 09:40:42 2012 +0200
+++ b/contrib/wix/guids.wxi Tue Sep 11 10:56:23 2012 -0300
@@ -27,10 +27,10 @@
<?define templates.root.guid = {8DF97574-33E9-412F-8414-65B48BB18783} ?>
<?define templates.atom.guid = {AB5D2908-BC95-44BE-9D79-069EF43D93E2} ?>
<?define templates.coal.guid = {B63CCAAB-4EAF-43b4-901E-4BD13F5B78FC} ?>
- <?define templates.gitweb.guid = {6A33D168-F84E-45AA-912C-23CAC2D66BCA} ?>
- <?define templates.monoblue.guid = {D27AA750-9394-4DAC-84FC-A546CE8F347A} ?>
- <?define templates.paper.guid = {D2591E56-709E-49F9-8A5F-1359E1CCD7E0} ?>
- <?define templates.raw.guid = {04DE03A2-FBFD-4c5f-8DEA-5436DDF4689D} ?>
+ <?define templates.gitweb.guid = {827334AF-1EFD-421B-962C-5660A068F612} ?>
+ <?define templates.monoblue.guid = {8060A1E4-BD4C-453E-92CB-9536DC44A9E3} ?>
+ <?define templates.paper.guid = {61AB1DE9-645F-46ED-8AF8-0CF02267FFBB} ?>
+ <?define templates.raw.guid = {3F88E9B6-EA3C-41EB-8D8A-3F12E7DE9933} ?>
<?define templates.rss.guid = {36069748-1E2A-472B-A212-506CB656A9C1} ?>
<?define templates.spartan.guid = {80222625-FA8F-44b1-86CE-1781EF375D09} ?>
<?define templates.static.guid = {B27D7311-050A-4A96-9971-B674A0EA21D0} ?>
--- a/contrib/wix/templates.wxs Mon Sep 10 09:40:42 2012 +0200
+++ b/contrib/wix/templates.wxs Tue Sep 11 10:56:23 2012 -0300
@@ -67,6 +67,7 @@
<File Id="gitweb.changeset.tmpl" Name="changeset.tmpl" />
<File Id="gitweb.error.tmpl" Name="error.tmpl" />
<File Id="gitweb.fileannotate.tmpl" Name="fileannotate.tmpl" />
+ <File Id="gitweb.filecomparison.tmpl" Name="filecomparison.tmpl" />
<File Id="gitweb.filediff.tmpl" Name="filediff.tmpl" />
<File Id="gitweb.filelog.tmpl" Name="filelog.tmpl" />
<File Id="gitweb.filerevision.tmpl" Name="filerevision.tmpl" />
@@ -95,6 +96,7 @@
<File Id="monoblue.changeset.tmpl" Name="changeset.tmpl" />
<File Id="monoblue.error.tmpl" Name="error.tmpl" />
<File Id="monoblue.fileannotate.tmpl" Name="fileannotate.tmpl" />
+ <File Id="monoblue.filecomparison.tmpl" Name="filecomparison.tmpl" />
<File Id="monoblue.filediff.tmpl" Name="filediff.tmpl" />
<File Id="monoblue.filelog.tmpl" Name="filelog.tmpl" />
<File Id="monoblue.filerevision.tmpl" Name="filerevision.tmpl" />
@@ -122,6 +124,7 @@
<File Id="paper.diffstat.tmpl" Name="diffstat.tmpl" />
<File Id="paper.error.tmpl" Name="error.tmpl" />
<File Id="paper.fileannotate.tmpl" Name="fileannotate.tmpl" />
+ <File Id="paper.filecomparison.tmpl" Name="filecomparison.tmpl" />
<File Id="paper.filediff.tmpl" Name="filediff.tmpl" />
<File Id="paper.filelog.tmpl" Name="filelog.tmpl" />
<File Id="paper.filelogentry.tmpl" Name="filelogentry.tmpl" />
@@ -148,6 +151,9 @@
<File Id="raw.error.tmpl" Name="error.tmpl" />
<File Id="raw.fileannotate.tmpl" Name="fileannotate.tmpl" />
<File Id="raw.filediff.tmpl" Name="filediff.tmpl" />
+ <File Id="raw.graph.tmpl" Name="graph.tmpl" />
+ <File Id="raw.graphedge.tmpl" Name="graphedge.tmpl" />
+ <File Id="raw.graphnode.tmpl" Name="graphnode.tmpl" />
<File Id="raw.index.tmpl" Name="index.tmpl" />
<File Id="raw.manifest.tmpl" Name="manifest.tmpl" />
<File Id="raw.map" Name="map" />
--- a/mercurial/cmdutil.py Mon Sep 10 09:40:42 2012 +0200
+++ b/mercurial/cmdutil.py Tue Sep 11 10:56:23 2012 -0300
@@ -10,7 +10,7 @@
import os, sys, errno, re, tempfile
import util, scmutil, templater, patch, error, templatekw, revlog, copies
import match as matchmod
-import subrepo, context, repair, bookmarks, graphmod, revset
+import subrepo, context, repair, bookmarks, graphmod, revset, phases
def parsealiases(cmd):
return cmd.lstrip("^").split("|")
@@ -1668,7 +1668,12 @@
user=user,
date=date,
extra=extra)
- newid = repo.commitctx(new)
+ ph = repo.ui.config('phases', 'new-commit', phases.draft)
+ try:
+ repo.ui.setconfig('phases', 'new-commit', old.phase())
+ newid = repo.commitctx(new)
+ finally:
+ repo.ui.setconfig('phases', 'new-commit', ph)
if newid != old.node():
# Reroute the working copy parent to the new changeset
repo.setparents(newid, nullid)
--- a/mercurial/help/subrepos.txt Mon Sep 10 09:40:42 2012 +0200
+++ b/mercurial/help/subrepos.txt Tue Sep 11 10:56:23 2012 -0300
@@ -13,11 +13,11 @@
2. Nested repository references. They are defined in ``.hgsub``, which
should be placed in the root of working directory, and
tell where the subrepository checkouts come from. Mercurial
- subrepositories are referenced like:
+ subrepositories are referenced like::
path/to/nested = https://example.com/nested/repo/path
- Git and Subversion subrepos are also supported:
+ Git and Subversion subrepos are also supported::
path/to/nested = [git]git://example.com/nested/repo/path
path/to/nested = [svn]https://example.com/nested/trunk/path
--- a/mercurial/subrepo.py Mon Sep 10 09:40:42 2012 +0200
+++ b/mercurial/subrepo.py Tue Sep 11 10:56:23 2012 -0300
@@ -838,7 +838,7 @@
name = ''.join(c.data for c
in e.getElementsByTagName('name')[0].childNodes
if c.nodeType == c.TEXT_NODE)
- paths.append(name)
+ paths.append(name.encode('utf-8'))
return paths
def filedata(self, name):
--- a/mercurial/templates/gitweb/graph.tmpl Mon Sep 10 09:40:42 2012 +0200
+++ b/mercurial/templates/gitweb/graph.tmpl Tue Sep 11 10:56:23 2012 -0300
@@ -51,11 +51,6 @@
var graph = new Graph();
graph.scale({bg_height});
-var revlink = '<li style="_STYLE"><span class="desc">';
-revlink += '<a class="list" href="{url}rev/_NODEID{sessionvars%urlparameter}" title="_NODEID"><b>_DESC</b></a>';
-revlink += '</span> _TAGS';
-revlink += '<span class="info">_DATE, by _USER</span></li>';
-
graph.vertex = function(x, y, color, parity, cur) \{
this.ctx.beginPath();
@@ -66,13 +61,6 @@
var bg = '<li class="bg parity' + parity + '"></li>';
var left = (this.columns + 1) * this.bg_height;
var nstyle = 'padding-left: ' + left + 'px;';
- var item = revlink.replace(/_STYLE/, nstyle);
- item = item.replace(/_PARITY/, 'parity' + parity);
- item = item.replace(/_NODEID/, cur[0]);
- item = item.replace(/_NODEID/, cur[0]);
- item = item.replace(/_DESC/, cur[3]);
- item = item.replace(/_USER/, cur[4]);
- item = item.replace(/_DATE/, cur[5]);
var tagspan = '';
if (cur[7].length || cur[8].length || (cur[6][0] != 'default' || cur[6][1])) \{
@@ -99,7 +87,11 @@
tagspan += '</span>';
}
- item = item.replace(/_TAGS/, tagspan);
+ var item = '<li style="' + nstyle + '"><span class="desc">';
+ item += '<a class="list" href="{url}rev/' + cur[0] + '{sessionvars%urlparameter}" title="' + cur[0] + '"><b>' + cur[3] + '</b></a>';
+ item += '</span> ' + tagspan + '';
+ item += '<span class="info">' + cur[5] + ', by ' + cur[4] + '</span></li>';
+
return [bg, item];
}
--- a/mercurial/templates/monoblue/graph.tmpl Mon Sep 10 09:40:42 2012 +0200
+++ b/mercurial/templates/monoblue/graph.tmpl Tue Sep 11 10:56:23 2012 -0300
@@ -49,10 +49,6 @@
var graph = new Graph();
graph.scale({bg_height});
- var revlink = '<li style="_STYLE"><span class="desc">';
- revlink += '<a href="{url}rev/_NODEID{sessionvars%urlparameter}" title="_NODEID">_DESC</a>';
- revlink += '</span>_TAGS<span class="info">_DATE, by _USER</span></li>';
-
graph.vertex = function(x, y, color, parity, cur) \{
this.ctx.beginPath();
@@ -63,13 +59,6 @@
var bg = '<li class="bg parity' + parity + '"></li>';
var left = (this.columns + 1) * this.bg_height;
var nstyle = 'padding-left: ' + left + 'px;';
- var item = revlink.replace(/_STYLE/, nstyle);
- item = item.replace(/_PARITY/, 'parity' + parity);
- item = item.replace(/_NODEID/, cur[0]);
- item = item.replace(/_NODEID/, cur[0]);
- item = item.replace(/_DESC/, cur[3]);
- item = item.replace(/_USER/, cur[4]);
- item = item.replace(/_DATE/, cur[5]);
var tagspan = '';
if (cur[7].length || cur[8].length || (cur[6][0] != 'default' || cur[6][1])) \{
@@ -96,7 +85,10 @@
tagspan += '</span>';
}
- item = item.replace(/_TAGS/, tagspan);
+ var item = '<li style="' + nstyle + '"><span class="desc">';
+ item += '<a href="{url}rev/' + cur[0] + '{sessionvars%urlparameter}" title="' + cur[0] + '">' + cur[3] + '</a>';
+ item += '</span>' + tagspan + '<span class="info">' + cur[5] + ', by ' + cur[4] + '</span></li>';
+
return [bg, item];
}
--- a/mercurial/templates/paper/graph.tmpl Mon Sep 10 09:40:42 2012 +0200
+++ b/mercurial/templates/paper/graph.tmpl Tue Sep 11 10:56:23 2012 -0300
@@ -62,10 +62,6 @@
var graph = new Graph();
graph.scale({bg_height});
-var revlink = '<li style="_STYLE"><span class="desc">';
-revlink += '<a href="{url}rev/_NODEID{sessionvars%urlparameter}" title="_NODEID">_DESC</a>';
-revlink += '</span>_TAGS<span class="info">_DATE, by _USER</span></li>';
-
graph.vertex = function(x, y, color, parity, cur) \{
this.ctx.beginPath();
@@ -76,13 +72,6 @@
var bg = '<li class="bg parity' + parity + '"></li>';
var left = (this.columns + 1) * this.bg_height;
var nstyle = 'padding-left: ' + left + 'px;';
- var item = revlink.replace(/_STYLE/, nstyle);
- item = item.replace(/_PARITY/, 'parity' + parity);
- item = item.replace(/_NODEID/, cur[0]);
- item = item.replace(/_NODEID/, cur[0]);
- item = item.replace(/_DESC/, cur[3]);
- item = item.replace(/_USER/, cur[4]);
- item = item.replace(/_DATE/, cur[5]);
var tagspan = '';
if (cur[7].length || cur[8].length || (cur[6][0] != 'default' || cur[6][1])) \{
@@ -108,8 +97,11 @@
}
tagspan += '</span>';
}
+
+ var item = '<li style="' + nstyle + '"><span class="desc">';
+ item += '<a href="{url}rev/' + cur[0] + '{sessionvars%urlparameter}" title="' + cur[0] + '">' + cur[3] + '</a>';
+ item += '</span>' + tagspan + '<span class="info">' + cur[5] + ', by ' + cur[4] + '</span></li>';
- item = item.replace(/_TAGS/, tagspan);
return [bg, item];
}
--- a/mercurial/templates/spartan/graph.tmpl Mon Sep 10 09:40:42 2012 +0200
+++ b/mercurial/templates/spartan/graph.tmpl Tue Sep 11 10:56:23 2012 -0300
@@ -43,10 +43,6 @@
var graph = new Graph();
graph.scale({bg_height});
-var revlink = '<li style="_STYLE"><span class="desc">';
-revlink += '<a href="{url}rev/_NODEID{sessionvars%urlparameter}" title="_NODEID">_DESC</a>';
-revlink += '</span><span class="info">_DATE, by _USER</span></li>';
-
graph.vertex = function(x, y, color, parity, cur) \{
this.ctx.beginPath();
@@ -57,14 +53,10 @@
var bg = '<li class="bg parity' + parity + '"></li>';
var left = (this.columns + 1) * this.bg_height;
var nstyle = 'padding-left: ' + left + 'px;';
- var item = revlink.replace(/_STYLE/, nstyle);
- item = item.replace(/_PARITY/, 'parity' + parity);
- item = item.replace(/_NODEID/, cur[0]);
- item = item.replace(/_NODEID/, cur[0]);
- item = item.replace(/_DESC/, cur[3]);
- item = item.replace(/_USER/, cur[4]);
- item = item.replace(/_DATE/, cur[5]);
-
+ var item = '<li style="' + nstyle + '"><span class="desc">';
+ item += '<a href="{url}rev/' + cur[0] + '{sessionvars%urlparameter}" title="' + cur[0] + '">' + cur[3] + '</a>';
+ item += '</span><span class="info">' + cur[5] + ', by ' + cur[4] + '</span></li>';
+
return [bg, item];
}
--- a/tests/test-commit-amend.t Mon Sep 10 09:40:42 2012 +0200
+++ b/tests/test-commit-amend.t Tue Sep 11 10:56:23 2012 -0300
@@ -25,7 +25,7 @@
$ cat >> $HGRCPATH <<EOF
> [hooks]
- > pretxncommit.foo = sh -c "echo \"pretxncommit \$HG_NODE\"; hg id -r \$HG_NODE"
+ > pretxncommit.foo = sh -c "echo \\"pretxncommit \$HG_NODE\\"; hg id -r \$HG_NODE"
> EOF
Amending changeset with changes in working dir:
@@ -355,3 +355,18 @@
$ hg log -r . --debug | grep extra
extra: branch=a
extra: source=2647734878ef0236dda712fae9c1651cf694ea8a
+
+Preserve phase
+
+ $ hg phase '.^::.'
+ 11: draft
+ 13: draft
+ $ hg phase --secret --force .
+ $ hg phase '.^::.'
+ 11: draft
+ 13: secret
+ $ hg commit --amend -m 'amend for phase' -q
+ $ hg phase '.^::.'
+ 11: draft
+ 13: secret
+
--- a/tests/test-hgweb-commands.t Mon Sep 10 09:40:42 2012 +0200
+++ b/tests/test-hgweb-commands.t Tue Sep 11 10:56:23 2012 -0300
@@ -980,11 +980,6 @@
var graph = new Graph();
graph.scale(39);
- var revlink = '<li style="_STYLE"><span class="desc">';
- revlink += '<a class="list" href="/rev/_NODEID?style=gitweb" title="_NODEID"><b>_DESC</b></a>';
- revlink += '</span> _TAGS';
- revlink += '<span class="info">_DATE, by _USER</span></li>';
-
graph.vertex = function(x, y, color, parity, cur) {
this.ctx.beginPath();
@@ -995,13 +990,6 @@
var bg = '<li class="bg parity' + parity + '"></li>';
var left = (this.columns + 1) * this.bg_height;
var nstyle = 'padding-left: ' + left + 'px;';
- var item = revlink.replace(/_STYLE/, nstyle);
- item = item.replace(/_PARITY/, 'parity' + parity);
- item = item.replace(/_NODEID/, cur[0]);
- item = item.replace(/_NODEID/, cur[0]);
- item = item.replace(/_DESC/, cur[3]);
- item = item.replace(/_USER/, cur[4]);
- item = item.replace(/_DATE/, cur[5]);
var tagspan = '';
if (cur[7].length || cur[8].length || (cur[6][0] != 'default' || cur[6][1])) {
@@ -1028,7 +1016,11 @@
tagspan += '</span>';
}
- item = item.replace(/_TAGS/, tagspan);
+ var item = '<li style="' + nstyle + '"><span class="desc">';
+ item += '<a class="list" href="/rev/' + cur[0] + '?style=gitweb" title="' + cur[0] + '"><b>' + cur[3] + '</b></a>';
+ item += '</span> ' + tagspan + '';
+ item += '<span class="info">' + cur[5] + ', by ' + cur[4] + '</span></li>';
+
return [bg, item];
}
--- a/tests/test-hgweb-empty.t Mon Sep 10 09:40:42 2012 +0200
+++ b/tests/test-hgweb-empty.t Tue Sep 11 10:56:23 2012 -0300
@@ -250,10 +250,6 @@
var graph = new Graph();
graph.scale(39);
- var revlink = '<li style="_STYLE"><span class="desc">';
- revlink += '<a href="/rev/_NODEID" title="_NODEID">_DESC</a>';
- revlink += '</span>_TAGS<span class="info">_DATE, by _USER</span></li>';
-
graph.vertex = function(x, y, color, parity, cur) {
this.ctx.beginPath();
@@ -264,13 +260,6 @@
var bg = '<li class="bg parity' + parity + '"></li>';
var left = (this.columns + 1) * this.bg_height;
var nstyle = 'padding-left: ' + left + 'px;';
- var item = revlink.replace(/_STYLE/, nstyle);
- item = item.replace(/_PARITY/, 'parity' + parity);
- item = item.replace(/_NODEID/, cur[0]);
- item = item.replace(/_NODEID/, cur[0]);
- item = item.replace(/_DESC/, cur[3]);
- item = item.replace(/_USER/, cur[4]);
- item = item.replace(/_DATE/, cur[5]);
var tagspan = '';
if (cur[7].length || cur[8].length || (cur[6][0] != 'default' || cur[6][1])) {
@@ -296,8 +285,11 @@
}
tagspan += '</span>';
}
+
+ var item = '<li style="' + nstyle + '"><span class="desc">';
+ item += '<a href="/rev/' + cur[0] + '" title="' + cur[0] + '">' + cur[3] + '</a>';
+ item += '</span>' + tagspan + '<span class="info">' + cur[5] + ', by ' + cur[4] + '</span></li>';
- item = item.replace(/_TAGS/, tagspan);
return [bg, item];
}
--- a/tests/test-largefiles.t Mon Sep 10 09:40:42 2012 +0200
+++ b/tests/test-largefiles.t Tue Sep 11 10:56:23 2012 -0300
@@ -13,7 +13,7 @@
> patterns=glob:**.dat
> usercache=${USERCACHE}
> [hooks]
- > precommit=sh -c "echo \"Invoking status precommit hook\"; hg status"
+ > precommit=sh -c "echo \\"Invoking status precommit hook\\"; hg status"
> EOF
Create the repo with a couple of revisions of both large and normal
@@ -434,7 +434,7 @@
$ cd ../addrm
$ cat >> .hg/hgrc <<EOF
> [hooks]
- > post-commit.stat=sh -c "echo \"Invoking status postcommit hook\"; hg status -A"
+ > post-commit.stat=sh -c "echo \\"Invoking status postcommit hook\\"; hg status -A"
> EOF
$ touch foo
$ hg add --large foo