Stefano Tortarolo <stefano.tortarolo@gmail.com> [Sun, 27 Mar 2011 13:34:20 +0200] rev 13894
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
Idan Kamara <idankk86@gmail.com> [Mon, 04 Apr 2011 23:43:22 +0300] rev 13893
tags: no need to check for valid nodes
_findtags in localrepo checks that nodes exist in the revlog so we
can't get a LookupError here.
The output of 'hg tags' stays the same since tags to unknown nodes
didn't get printed before anyway due to ae3089cefaab.
Idan Kamara <idankk86@gmail.com> [Mon, 04 Apr 2011 22:51:10 +0300] rev 13892
localrepo: ignore tags to unknown nodes (issue2750)
Arne Babenhauserheide <bab@draketo.de> [Tue, 05 Apr 2011 19:48:44 +0200] rev 13891
merge: added info that hg help merge-tools shows the options for --tool
Adrian Buehlmann <adrian@cadifra.com> [Tue, 05 Apr 2011 11:55:52 +0200] rev 13890
util: move checklink() to posix.py and return False on Windows
Python added support for Windows 6.0 (Vista) symbolic links in 3.2 [1], but
even these symbolic links aren't what we can expect from a canonical
symbolic link, since creation requires SeCreateSymbolicLinkPrivilege,
which typically only admins have.
So we can safely assume that we don't have symbolic links on Windows.
[1] http://docs.python.org/py3k/library/os.html#os.symlink
Yun Lee <yunlee.bj@gmail.com> [Tue, 05 Apr 2011 16:55:47 +0800] rev 13889
util: make 'hg log -d --2' abort (issue2734)
Yun Lee <yunlee.bj@gmail.com> [Tue, 05 Apr 2011 12:40:47 +0800] rev 13888
help: sort help topics to make the output more readable (issue2751)
Martin Geisler <mg@aragost.com> [Tue, 05 Apr 2011 11:09:08 +0200] rev 13887
merge with stable
Martin Geisler <mg@aragost.com> [Tue, 05 Apr 2011 10:01:39 +0200] rev 13886
help/dates: use DATE as place-holder in help and abort texts
The use of "{datetime}" was unfortunate since I as a user never knew
if I was expected to do
hg log -d '>{2011-04-01}'
or
hg log -d '>2011-04-01'
The word "datetime" is also confusing -- calling it a date it much
simpler.
Martin Geisler <mg@aragost.com> [Tue, 05 Apr 2011 11:07:25 +0200] rev 13885
keyword: convert a verbatim block to a field list
Martin Geisler <mg@aragost.com> [Tue, 05 Apr 2011 10:22:58 +0200] rev 13884
bugzilla: convert a verbatim block to a field list
Martin Geisler <mg@aragost.com> [Tue, 05 Apr 2011 10:20:59 +0200] rev 13883
bugzilla: fix reST error introduced in 22d200e49b10
All blocks must be indented. Here we can use a field list instead of a
verbatim block for a real list layout.
Martin Geisler <mg@aragost.com> [Tue, 05 Apr 2011 10:04:19 +0200] rev 13882
help/dates: rephrase explanation of internal format
The old explanation referred to the two numbers as "unixtime" and
"offset" without really defining those terms.
Matt Mackall <mpm@selenic.com> [Mon, 04 Apr 2011 23:14:03 -0500] rev 13881
rebase: drop ancestor import
Matt Mackall <mpm@selenic.com> [Mon, 04 Apr 2011 16:58:24 -0500] rev 13880
rebase: drop unused p2 arg from rebasenode
Adrian Buehlmann <adrian@cadifra.com> [Mon, 04 Apr 2011 11:41:54 +0200] rev 13879
util: move checkexec() to posix.py and return False on Windows
Matt Mackall <mpm@selenic.com> [Mon, 04 Apr 2011 16:21:59 -0500] rev 13878
misc: replace .parents()[0] with p1()
Matt Mackall <mpm@selenic.com> [Mon, 04 Apr 2011 16:21:57 -0500] rev 13877
filectx: introduce p1/p2 convenience methods
Matt Mackall <mpm@selenic.com> [Mon, 04 Apr 2011 15:52:55 -0500] rev 13876
dirstate: add p1/p2 convenience methods
Matt Mackall <mpm@selenic.com> [Mon, 04 Apr 2011 15:30:54 -0500] rev 13875
rebase: use merge's ancestor parameter
Matt Mackall <mpm@selenic.com> [Mon, 04 Apr 2011 15:25:20 -0500] rev 13874
merge: add ancestor to the update function
This makes it easier to do rebase-like operations.
Matt Mackall <mpm@selenic.com> [Mon, 04 Apr 2011 14:21:54 -0500] rev 13873
revset: teach optimizer that closed is slowish
Idan Kamara <idankk86@gmail.com> [Mon, 04 Apr 2011 18:05:14 +0300] rev 13872
localrepo: tighten except clause when looking rev
Jim Hague <jim.hague@acm.org> [Mon, 04 Apr 2011 17:37:18 +0100] rev 13871
bugzilla: more documentation fixes
Correct formatting of the possible values of bugzilla.version.
Fix typo and polish XMLRPC/email mode description.
Jim Hague <jim.hague@acm.org> [Mon, 04 Apr 2011 13:31:37 +0100] rev 13870
bugzilla: correct sample configurations
Use consistent sample domains and wording in all configuration examples.
Add missing template and strip parameters to XMLRPC examples and correct
Bugzilla URL key in XMLRPC+email.
Matt Mackall <mpm@selenic.com> [Mon, 04 Apr 2011 09:39:22 -0500] rev 13869
date: fixup breakage from ">" fix
Matt Mackall <mpm@selenic.com> [Mon, 04 Apr 2011 08:26:08 -0500] rev 13868
merge with stable
Yun Lee <yunlee.bj@gmail.com> [Mon, 04 Apr 2011 00:23:21 +0800] rev 13867
log: abort for -d '>' or -d '<' (issue2749)
Edouard Gomez <ed.gomez@free.fr> [Mon, 04 Apr 2011 00:05:41 +0200] rev 13866
convert: add hg source bookmark test
Yuya Nishihara <yuya@tcha.org> [Sun, 03 Apr 2011 23:47:17 +0900] rev 13865
hgweb: add missing bookmarks definition to coal/map
It shares most templates with paper style.
Yuya Nishihara <yuya@tcha.org> [Sun, 03 Apr 2011 23:47:05 +0900] rev 13864
hgweb: add separate bookmarks listing to gitweb theme (based on 38c9837b1f75)
Yuya Nishihara <yuya@tcha.org> [Sun, 03 Apr 2011 23:44:28 +0900] rev 13863
hgweb: add bookmark labels to gitweb theme (based on 270f57d35525)
Yuya Nishihara <yuya@tcha.org> [Sun, 03 Apr 2011 23:42:05 +0900] rev 13862
hgweb: format page_nav of gitweb/error.tmpl and add missing links
Yuya Nishihara <yuya@tcha.org> [Sun, 03 Apr 2011 22:53:20 +0900] rev 13861
hgweb: fix typo and inactive link in page_nav and page_header of gitweb's help
Yuya Nishihara <yuya@tcha.org> [Sun, 03 Apr 2011 22:53:20 +0900] rev 13860
hgweb: add separate bookmarks listing to monoblue theme (based on 38c9837b1f75)
Yuya Nishihara <yuya@tcha.org> [Sun, 03 Apr 2011 22:53:19 +0900] rev 13859
hgweb: fix typo in page-header of monoblue's help template
Yuya Nishihara <yuya@tcha.org> [Sun, 03 Apr 2011 22:53:19 +0900] rev 13858
hgweb: add missing bookmarks templates to atom/rss styles
It's already referenced from paper style.
Adrian Buehlmann <adrian@cadifra.com> [Sun, 03 Apr 2011 01:57:17 +0200] rev 13857
subrepo: process merge substate in sorted order in submerge()
This ensures that subrepositories are pulled in a well defined
order when cloning the parent repository.
BEFORE:
$ hg clone http://hg.gerg.ca/allextensions
destination directory: allextensions
requesting all changes
adding changesets
adding manifests
adding file changes
added 10 changesets with 20 changes to 6 files
updating to branch default
pulling subrepo caseguard from http://bitbucket.org/alexandru/caseguard
real URL is https://bitbucket.org/alexandru/caseguard
requesting all changes
adding changesets
adding manifests
adding file changes
added 81 changesets with 100 changes to 13 files
pulling subrepo hg-prompt from http://bitbucket.org/sjl/hg-prompt
real URL is https://bitbucket.org/sjl/hg-prompt
requesting all changes
adding changesets
adding manifests
adding file changes
added 114 changesets with 176 changes to 35 files
pulling subrepo hgpaste from http://bitbucket.org/birkenfeld/hgpaste
real URL is https://bitbucket.org/birkenfeld/hgpaste
requesting all changes
adding changesets
adding manifests
adding file changes
added 18 changesets with 18 changes to 2 files
...
AFTER:
$ hg clone http://hg.gerg.ca/allextensions
destination directory: allextensions
requesting all changes
adding changesets
adding manifests
adding file changes
added 10 changesets with 20 changes to 6 files
updating to branch default
pulling subrepo Artemis from http://hg.mrzv.org/Artemis
requesting all changes
adding changesets
adding manifests
adding file changes
added 55 changesets with 108 changes to 47 files
...
Stefano Tortarolo <stefano.tortarolo@gmail.com> [Sat, 02 Apr 2011 11:07:05 +0200] rev 13856
rebase: add --tool argument for specifying merge tool
Adrian Buehlmann <adrian@cadifra.com> [Fri, 01 Apr 2011 22:44:58 +0200] rev 13855
revert: note that added files are left as is
Patrick Mezard <pmezard@gmail.com> [Fri, 01 Apr 2011 20:40:27 +0200] rev 13854
bugzilla: fix documentation typo
Matt Mackall <mpm@selenic.com> [Fri, 01 Apr 2011 13:25:44 -0500] rev 13853
merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 01 Apr 2011 13:25:26 -0500] rev 13852
merge with i18n
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 01 Apr 2011 14:35:04 -0300] rev 13851
i18n-pt_BR: synchronized with 8d960240faac
Kevin Gessner <kevin@fogcreek.com> [Thu, 31 Mar 2011 15:49:53 -0400] rev 13850
hgweb: add base link to file log for paper and coal styles (issue2452)
Brodie Rao <brodie@bitheap.org> [Wed, 05 Jan 2011 00:18:36 +1100] rev 13849
HGPLAIN: allow exceptions to plain mode, like i18n, via HGPLAINEXCEPT
This makes it possible to gain the benefits of HGPLAIN for scripting
while preserving different behaviors like internationalization.
Brodie Rao <brodie@bitheap.org> [Thu, 31 Mar 2011 17:37:33 -0700] rev 13848
url: be stricter about detecting schemes
While the URL parser is very forgiving about what characters are
allowed in each component, it's useful to be strict about the scheme
so we don't accidentally interpret local paths with colons as URLs.
This restricts schemes to containing alphanumeric characters, dashes,
pluses, and dots (as specified in RFC 2396).
Matt Mackall <mpm@selenic.com> [Fri, 01 Apr 2011 12:42:02 -0500] rev 13847
Added signature for changeset b032bec2c0a6
Matt Mackall <mpm@selenic.com> [Fri, 01 Apr 2011 12:41:56 -0500] rev 13846
Added tag 1.8.2 for changeset b032bec2c0a6
Matt Mackall <mpm@selenic.com> [Fri, 01 Apr 2011 11:45:29 -0500] rev 13845
merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 01 Apr 2011 11:45:07 -0500] rev 13844
merge with i18n
Wagner Bruna <wbruna@yahoo.com> [Fri, 01 Apr 2011 07:53:15 -0300] rev 13843
i18n-pt_BR: synchronized with 794f4476b974
Martin Geisler <mg@aragost.com> [Fri, 01 Apr 2011 12:30:40 +0200] rev 13842
bugzilla: fix bad reST markup
The indented second line turned the first line into a description
header.
Martin Geisler <mg@aragost.com> [Fri, 01 Apr 2011 12:27:12 +0200] rev 13841
bugzilla: markup literal text as such
Martin Geisler <mg@aragost.com> [Fri, 01 Apr 2011 12:21:59 +0200] rev 13840
merge with stable
Martin Geisler <mg@aragost.com> [Fri, 01 Apr 2011 12:18:37 +0200] rev 13839
help/hgweb: add pointer to hgrc(5) location
Martin Geisler <mg@aragost.com> [Fri, 01 Apr 2011 12:14:42 +0200] rev 13838
patchbomb, help/hgweb: do not refer to config files as hgrc files
Martin Geisler <mg@aragost.com> [Fri, 01 Apr 2011 12:09:11 +0200] rev 13837
bugzilla: refer to hgrc(5) man page with normal notation
Martin Geisler <mg@aragost.com> [Fri, 01 Apr 2011 12:07:37 +0200] rev 13836
bugzilla: markup section names as literal text
Martin Geisler <mg@aragost.com> [Fri, 01 Apr 2011 12:05:19 +0200] rev 13835
bugzilla: show usermap syntax more clearly
Martin Geisler <mg@aragost.com> [Fri, 01 Apr 2011 12:03:23 +0200] rev 13834
bugzilla: use standard section.name notation
Martin Geisler <mg@aragost.com> [Fri, 01 Apr 2011 12:00:57 +0200] rev 13833
bugzilla: prefix each config option with section
Martin Geisler <mg@aragost.com> [Fri, 01 Apr 2011 11:59:18 +0200] rev 13832
bugzilla: fix reStructuredText errors introduced in 60256f7f30c1
Matt Mackall <mpm@selenic.com> [Thu, 31 Mar 2011 15:24:06 -0500] rev 13831
changegroup: introduce bundler objects
This makes the bundler pluggable at lower levels.
Matt Mackall <mpm@selenic.com> [Thu, 31 Mar 2011 14:25:26 -0500] rev 13830
changegroup: combine lookup functions
Matt Mackall <mpm@selenic.com> [Thu, 31 Mar 2011 13:56:05 -0500] rev 13829
changegroup: unnest flookup
Matt Mackall <mpm@selenic.com> [Thu, 31 Mar 2011 12:04:54 -0500] rev 13828
changegroup: unnest clookup and mlookup like changegroupsubset
Matt Mackall <mpm@selenic.com> [Thu, 31 Mar 2011 10:43:53 -0500] rev 13827
url: nuke some newly-introduced underbars in identifiers
Brodie Rao <brodie@bitheap.org> [Wed, 30 Mar 2011 20:03:05 -0700] rev 13826
url: refactor util.drop_scheme() and hg.localpath() into url.localpath()
This replaces util.drop_scheme() with url.localpath(), using url.url for
parsing instead of doing it on its own. The function is moved from
util to url to avoid an import cycle.
hg.localpath() is removed in favor of using url.localpath(). This
provides more consistent behavior between "hg clone" and other
commands.
To preserve backwards compatibility, URLs like bundle://../foo still
refer to ../foo, not /foo.
If a URL contains a scheme, percent-encoded entities are decoded. When
there's no scheme, all characters are left untouched.
Comparison of old and new behaviors:
URL drop_scheme() hg.localpath() url.localpath()
=== ============= ============== ===============
file://foo/foo /foo foo/foo /foo
file://localhost:80/foo /foo localhost:80/foo /foo
file://localhost:/foo /foo localhost:/foo /foo
file://localhost/foo /foo /foo /foo
file:///foo /foo /foo /foo
file://foo (empty string) foo /
file:/foo /foo /foo /foo
file:foo foo foo foo
file:foo%23bar foo%23bar foo%23bar foo#bar
foo%23bar foo%23bar foo%23bar foo%23bar
/foo /foo /foo /foo
Windows-related paths on Windows:
URL drop_scheme() hg.localpath() url.localpath()
=== ============= ============== ===============
file:///C:/foo C:/C:/foo /C:/foo C:/foo
file:///D:/foo C:/D:/foo /D:/foo D:/foo
file://C:/foo C:/foo C:/foo C:/foo
file://D:/foo C:/foo D:/foo D:/foo
file:////foo/bar //foo/bar //foo/bar //foo/bar
//foo/bar //foo/bar //foo/bar //foo/bar
\\foo\bar //foo/bar //foo/bar \\foo\bar
Windows-related paths on other platforms:
file:///C:/foo C:/C:/foo /C:/foo C:/foo
file:///D:/foo C:/D:/foo /D:/foo D:/foo
file://C:/foo C:/foo C:/foo C:/foo
file://D:/foo C:/foo D:/foo D:/foo
file:////foo/bar //foo/bar //foo/bar //foo/bar
//foo/bar //foo/bar //foo/bar //foo/bar
\\foo\bar //foo/bar //foo/bar \\foo\bar
For more information about file:// URL handling, see:
http://www-archive.mozilla.org/quality/networking/testing/filetests.html
Related issues:
- issue1153: File URIs aren't handled correctly in windows
This patch should preserve the fix implemented in
2770d03ae49f. However, it goes a step further and "promotes"
Windows-style drive letters from being interpreted as host names to
being part of the path.
- issue2154: Cannot escape '#' in Mercurial URLs (#1172 in THG)
The fragment is still interpreted as a revision or a branch, even in
paths to bundles. However, when file: is used, percent-encoded
entities are decoded, so file:test%23bundle.hg can refer to
test#bundle.hg ond isk.
Brodie Rao <brodie@bitheap.org> [Wed, 30 Mar 2011 20:02:17 -0700] rev 13825
url: use url.url in ui.expandpath()
Brodie Rao <brodie@bitheap.org> [Wed, 30 Mar 2011 20:02:09 -0700] rev 13824
hg: use url.url to parse branch names in parseurl()
Brodie Rao <brodie@bitheap.org> [Wed, 30 Mar 2011 20:02:07 -0700] rev 13823
hg: look up schemes using url.url
Brodie Rao <brodie@bitheap.org> [Wed, 30 Mar 2011 20:01:47 -0700] rev 13822
schemes: prevent one letter schemes from being interpreted as drive letters
To allow one letter schemes, this makes the extension override
url.has_drive_letter() to return False for any schemes defined.
On Windows, the extension will raise util.Abort for any schemes that
conflict with existing drive letters.
Brodie Rao <brodie@bitheap.org> [Wed, 30 Mar 2011 20:01:46 -0700] rev 13821
hgweb: use url.url when setting CGI environment variables
Brodie Rao <brodie@bitheap.org> [Wed, 30 Mar 2011 20:01:44 -0700] rev 13820
url: use url.url in proxyhandler
Brodie Rao <brodie@bitheap.org> [Wed, 30 Mar 2011 20:01:35 -0700] rev 13819
httprepo/sshrepo: use url.url
Like the previous patch to getauthinfo(), this also makes
username/password parsing more forgiving for SSH URLs.
This also opens up the possibility of allowing non-numeric ports,
since the URL parser has no problem handling them.
Related issues:
- issue851: @ in password in http url
- issue2055: nonnumeric port bug with https protocol
Brodie Rao <brodie@bitheap.org> [Wed, 30 Mar 2011 20:01:34 -0700] rev 13818
url: use url.url in url.open()
Brodie Rao <brodie@bitheap.org> [Wed, 30 Mar 2011 20:01:31 -0700] rev 13817
url: abort on file:// URLs with non-localhost hosts
Brodie Rao <brodie@bitheap.org> [Wed, 30 Mar 2011 20:00:24 -0700] rev 13816
url: special case bundle URL parsing to preserve backwards compatibility
This allows bundle://../foo to continue to refer to the relative path
../foo (bundle URLs do not take host names).
Brodie Rao <brodie@bitheap.org> [Wed, 30 Mar 2011 20:00:23 -0700] rev 13815
url: add trailing slashes to URLs with hostnames that don't have one
This works around a potential issue in Python 2.4 where cloning a repo
with a URL like http://foo:8080 would cause urllib2 to query on
http://foo:8080?cmd=capabilities instead of
http://foo:8080/?cmd=capabilities.
In the past, this issue has been masked by the fact that
url.getauthinfo() added a trailing slash when it was missing.
Brodie Rao <brodie@bitheap.org> [Wed, 30 Mar 2011 19:50:56 -0700] rev 13814
url: move drive letter checking into has_drive_letter() for extensions
This will let the schemes extension override drive letter detection to
allow single letter schemes.
Matt Mackall <mpm@selenic.com> [Thu, 31 Mar 2011 10:03:24 -0500] rev 13813
changegroup: unnest some lookup functions
Matt Mackall <mpm@selenic.com> [Thu, 31 Mar 2011 09:59:56 -0500] rev 13812
changegroup: minor ordering and renaming changes for similarity
This eliminates some needless differences between the two changegroup variants
Matt Mackall <mpm@selenic.com> [Thu, 31 Mar 2011 09:56:27 -0500] rev 13811
changegroup: remove nodeiter temporary
Matt Mackall <mpm@selenic.com> [Wed, 30 Mar 2011 17:50:34 -0500] rev 13810
changegroup: refactor prune as a filter
Matt Mackall <mpm@selenic.com> [Wed, 30 Mar 2011 17:50:27 -0500] rev 13809
changegroup: add first logic to send file header
This will allow us to later change how we filter needed file nodes
Matt Mackall <mpm@selenic.com> [Wed, 30 Mar 2011 14:42:41 -0500] rev 13808
url: fix tests
Matt Mackall <mpm@selenic.com> [Wed, 30 Mar 2011 13:34:39 -0500] rev 13807
url: deal with drive letters
David Soria Parra <dsp@php.net> [Mon, 14 Mar 2011 23:50:28 +0100] rev 13806
bookmarks: do not forward merged bookmark (issue1877)
Matt Mackall <mpm@selenic.com> [Wed, 30 Mar 2011 13:23:24 -0500] rev 13805
merge with stable
Kevin Berridge <kevin.w.berridge@gmail.com> [Mon, 28 Mar 2011 20:56:56 -0400] rev 13804
pull: new output message when there are multiple branches
Pull outputs a slightly new message when there are multiple branches and
the current branch has many heads:
(run 'hg heads .' to see heads, 'hg merge' to merge)
This message adds the "." in hg heads to encourage you to consider only the
current branch's heads.
Kevin Berridge <kevin.w.berridge@gmail.com> [Fri, 11 Mar 2011 20:43:12 -0500] rev 13803
pull: don't suggest running hg merge when new heads are on different branches
After a pull when new heads are added but no head is added on the current
branch, the "run 'hg merge'" message can be misleading. This patch doesn't
output the merge message in that scenario.
Jim Hague <jim.hague@acm.org> [Wed, 30 Mar 2011 09:49:45 +0100] rev 13802
bugzilla: add modified XMLRPC mode that uses email to send bug comments.
If Bugzilla has its email interface configured, an email can be used
to update bugs. If the From: address in the email matches a valid user
email, Bugzillas make the update as that user. So comments attached to a
bug appear under the name of the user making the change, and the user
does not receive email about the change, exactly as if they had made
the change via the web interface.
So add a modified XMLRPC mode that uses email to modify bugs. The format
of the mails is documented in the Bugzilla email_in.pl specification.
Briefly, initial non-blank lines in the message body starting
'@<field> = <value> modify bug fields. A blank line signals the end of
the command lines, and the rest of the message is used as bug comment.
Invoke the same Mercurial user to Bugzilla user email mapping
currently used in the MySQL mode.
All other processing - checking the bug numbers, checking user ids, etc.
continues to be done via XMLRPC.
Jim Hague <jim.hague@acm.org> [Wed, 30 Mar 2011 09:49:45 +0100] rev 13801
bugzilla: add XMLRPC interface.
Add support for access to Bugzilla via the XMLRPC interface.
This requires a single username and password used to log in to Bugzilla,
plus the URL of the Bugzilla installation. Commit messages are added to
bugs as before, but security only permits them to be added as the
username used to log in.
Jim Hague <jim.hague@acm.org> [Wed, 30 Mar 2011 09:49:45 +0100] rev 13800
bugzilla: localise all MySQL direct access inside access class.
Prepare for the addition of other Bugzilla access methods by localising
direct MySQL database access inside an access class.
Provide a base access class largely to document the methods required for
a class implementing a particular access method.
Rename the 'bugzilla_<version>' classes to 'bzmysql_<version>' to
emphasise that they are doing access via direct manipulation of a
MySQL database.
Jim Hague <jim.hague@acm.org> [Wed, 30 Mar 2011 09:49:45 +0100] rev 13799
bugzilla: keep bug IDs in set.
Bug IDs are collected into a set, and then silently converted in
filter_real_bug_ids() into a list. For consistency, keep them in
a set throughout and update the docstrings to say that.
Jim Hague <jim.hague@acm.org> [Wed, 30 Mar 2011 09:49:45 +0100] rev 13798
bugzilla: rename filter_unknown_bug_ids to reflect its actual purpose.
The method really removes from the list of bugs any that already have
comment text referencing the changeset in question. Rename it to
filter_cset_known_bug_ids().
Adrian Buehlmann <adrian@cadifra.com> [Tue, 29 Mar 2011 19:20:28 +0200] rev 13797
test-paths.t: 'file:' disables [paths] entries for clone dest
timeless@gmail.com [Tue, 29 Mar 2011 16:33:10 +0000] rev 13796
hgwebdir: handle IOErrors from localrepo while enumerating
Repository() raises a number of IOErrors in addition to RepoErrors.
these are just as uninteresting as RepoErrors and should be ignored
The easiest case of this is a repo whose .hg/ directory is -rx
Adrian Buehlmann <adrian@cadifra.com> [Mon, 28 Mar 2011 15:54:22 +0200] rev 13795
set NOT_CONTENT_INDEXED on .hg dir (issue2694)
when running on Windows
Yuya Nishihara <yuya@tcha.org> [Wed, 30 Mar 2011 02:22:15 +0900] rev 13794
hgweb: add bookmark labels to monoblue theme (based on 270f57d35525)
Martin Geisler <mg@aragost.com> [Tue, 29 Mar 2011 16:25:48 +0200] rev 13793
merge with stable
Daniel Atallah <daniel.atallah@gmail.com> [Mon, 28 Mar 2011 23:16:20 -0400] rev 13792
convert/mtn: Fix conversion of large files from mtn (broken in ed97955e0c04)
"mtn automate stdio" will break output larger than 32kB into several packets.
This ensures that we are processing all the output on the main stream and not
only the last packet.
timeless@gmail.com [Tue, 29 Mar 2011 16:45:23 +0300] rev 13791
mq: fix qselect help for qguard
Brendan Cully <brendan@kublai.com> [Mon, 28 Mar 2011 21:36:29 -0700] rev 13790
Fix transplant error message to correspond with test
Luke Plant <L.Plant.98@cantab.net> [Mon, 28 Mar 2011 21:17:32 +0100] rev 13789
transplant: fix crash if filter script munges log file
This fixes an UnboundLocalError crash if the filter script removes the
'User' or 'Date' lines from the log file.
Matt Mackall <mpm@selenic.com> [Mon, 28 Mar 2011 11:18:56 -0500] rev 13788
changegroup: fold linkrev helper into lookup functions
Matt Mackall <mpm@selenic.com> [Mon, 28 Mar 2011 11:18:56 -0500] rev 13787
changegroup: fold filenode collector into mlookup
Matt Mackall <mpm@selenic.com> [Mon, 28 Mar 2011 11:18:56 -0500] rev 13786
changegroup: roll changegroup.collector into lookup functions
Matt Mackall <mpm@selenic.com> [Mon, 28 Mar 2011 11:18:56 -0500] rev 13785
changegroup: add revlog to the group callback
Matt Mackall <mpm@selenic.com> [Mon, 28 Mar 2011 11:18:56 -0500] rev 13784
changegroup: move sorting down into group
Matt Mackall <mpm@selenic.com> [Mon, 28 Mar 2011 11:18:56 -0500] rev 13783
changegroup: fold progress meter into callbacks
progress meters now start at 1 rather than 0
Matt Mackall <mpm@selenic.com> [Mon, 28 Mar 2011 11:18:56 -0500] rev 13782
changegroup: combine infocollect and lookup callbacks
Matt Mackall <mpm@selenic.com> [Thu, 24 Mar 2011 17:16:30 -0500] rev 13781
changegroup: drop unused fullrev
This is unfinished and unused and complicates expanding the wire protocol.
Idan Kamara <idankk86@gmail.com> [Sun, 27 Mar 2011 23:48:58 +0200] rev 13780
util: dates cannot consist entirely of whitespace (issue2732)
Daniel Atallah <daniel.atallah@gmail.com> [Fri, 25 Mar 2011 15:49:43 -0400] rev 13779
convert/mtn: convert suspended branches as closed branches
Monotone treats branch closing ("suspending") in a similar manner to how we do
in mercurial - a cert is added to a revision that marks the branch to be hidden.
If a subsequent commit is made, the branch is effectively reopened.
Stefano Tortarolo <stefano.tortarolo@gmail.com> [Sun, 27 Mar 2011 13:34:20 +0200] rev 13778
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
Adrian Buehlmann <adrian@cadifra.com> [Sun, 27 Mar 2011 12:22:07 +0200] rev 13777
windows: use win32.unlink in unlinkpath()
os.unlink fails to remove files with READONLY attribute
Adrian Buehlmann <adrian@cadifra.com> [Sun, 27 Mar 2011 01:47:58 +0100] rev 13776
win32: remove READONLY attribute on unlink
Adrian Buehlmann <adrian@cadifra.com> [Sun, 27 Mar 2011 01:17:48 +0100] rev 13775
windows: move unlink to win32.py
no code change
Martin Geisler <mg@lazybytes.net> [Sun, 27 Mar 2011 12:59:25 +0200] rev 13774
ui: label prompts, default to yellow prompts
Martin Geisler <mg@lazybytes.net> [Sun, 27 Mar 2011 12:41:55 +0200] rev 13773
record: replace poor man's if-statement with real if-statement
Brodie Rao <brodie@bitheap.org> [Fri, 25 Mar 2011 22:59:09 -0700] rev 13772
url: use url.url in hidepassword() and removeauth()
Brodie Rao <brodie@bitheap.org> [Fri, 25 Mar 2011 22:59:04 -0700] rev 13771
subrepos: use url.url when normalizing repo paths
This works around an issue in older versions of Python that would
strip double slashes from SSH URLs when using urlunparse() on a parsed
URL.
Related issues:
- issue1755: WinXP: cmd line hg 1.3 clone of subrepo fails, due to %5C
'\'? (originally fixed by f783bb979fb3).
Brodie Rao <brodie@bitheap.org> [Fri, 25 Mar 2011 22:58:56 -0700] rev 13770
url: provide url object
This adds a url object that re-implements urlsplit() and
unsplit(). The implementation splits out usernames, passwords, and
ports.
The implementation is based on the behavior specified by RFC
2396[1]. However, it is much more forgiving than the RFC's
specification; it places no specific restrictions on what characters
are allowed in each segment of the URL other than what is necessary to
split the URL into its constituent parts.
[1]: http://www.ietf.org/rfc/rfc2396.txt
Adrian Buehlmann <adrian@cadifra.com> [Wed, 23 Feb 2011 23:30:48 +0100] rev 13769
cmdutil: fix mode handling in make_file
Matt Mackall <mpm@selenic.com> [Sat, 26 Mar 2011 17:12:02 -0500] rev 13768
revlog: change variable name to avoid reuse
Adrian Buehlmann <adrian@cadifra.com> [Sat, 26 Mar 2011 10:59:33 +0100] rev 13767
debugstate: add new --datesort option
sorts the output lines by mtime, then by filename
Stefano Tortarolo <stefano.tortarolo@gmail.com> [Sat, 26 Mar 2011 13:05:17 +0100] rev 13766
rebase: restore mq guards after rebasing (issue2107)
Guards on rebased mq patches were lost.
This patch restores them after the qimporting step.
Idan Kamara <idankk86@gmail.com> [Fri, 25 Mar 2011 22:18:05 +0200] rev 13765
tests: no need to explicitly export HOME in test files
the test runner ensures that HOME is set to a temp dir
Idan Kamara <idankk86@gmail.com> [Fri, 25 Mar 2011 22:15:37 +0200] rev 13764
tests: set HOME to the test temp dir (issue2707)
Adrian Buehlmann <adrian@cadifra.com> [Fri, 25 Mar 2011 15:03:53 +0100] rev 13763
dirstate: eliminate _lastnormal set
We can get rid of the _lastnormal set by using the filesystem mtimes to
identify the problematic "lastnormal" files on status(), forcing a file
content-comparison if the file's mtime timeslot is equal to _lastnormaltime.
Patrick Mezard <pmezard@gmail.com> [Fri, 25 Mar 2011 16:46:19 +0100] rev 13762
test-extdiff: fix 5c0e1222e7c0 temporary dir output
Daniel Atallah <daniel.atallah@gmail.com> [Fri, 25 Mar 2011 10:13:46 -0400] rev 13761
convert/mtn: avoid unnecessary initial test of mtn repo
As soon as before() is called, we'll know if there is a problem (and get a
better error message).
Daniel Atallah <daniel.atallah@gmail.com> [Wed, 23 Mar 2011 14:26:56 -0400] rev 13760
convert/mtn: add support for using monotone's "automate stdio" when available
Currently the convert extension spawns a new mtn process for each
operation. For a large repository, this ends up being hundreds of
thousands of processes. The following enables usage of monotone's
"automate stdio" functionality - documented at:
http://www.monotone.ca/docs/Automation.html#index-mtn-automate-stdio-188
The effect is that (after determining that a new enough mtn executable
is available) a single long-running mtn process is used for all the
operations, using stdin/stdout to send commands and read output.
This has a pretty significant effect on the performance of some parts
of the conversion process.
Daniel Atallah <daniel.atallah@gmail.com> [Thu, 24 Mar 2011 16:54:09 -0400] rev 13759
convert: add support to common commandline to access stdin of the process
jfh <jason@jasonfharris.com> [Mon, 21 Mar 2011 17:03:16 +0100] rev 13758
extdiff: use absolute paths for any temporary files
This allows the use of p4merge amongst possible other external tools.
Edouard Gomez <ed.gomez@free.fr> [Fri, 25 Mar 2011 01:38:47 +0100] rev 13757
convert: add bookmark support to hg source
Edouard Gomez <ed.gomez@free.fr> [Fri, 25 Mar 2011 01:38:43 +0100] rev 13756
convert: add bookmarks reading support to git backend
Matt Mackall <mpm@selenic.com> [Thu, 24 Mar 2011 15:12:51 -0500] rev 13755
ssh: fix password test
We don't support passwords in ssh URLs, and neither do some versions
of Python's urllib. Since we don't actually care much here, punt with
a glob in the test.
Adrian Buehlmann <adrian@cadifra.com> [Thu, 24 Mar 2011 18:39:54 +0100] rev 13754
dirstate: check mtime when adding to _lastnormal
- consistently use mtime as mapped to dirstate granularity (needed for
filesystems like NTFS, which have sub-second resolution)
- no need to add files with mtime < _lastnormaltime
- improve comments
Martin Geisler <mg@aragost.com> [Thu, 24 Mar 2011 18:17:49 +0100] rev 13753
subrepo: simplify hgsubrepo._get a little
Lee Cantey <lcantey@gmail.com> [Thu, 24 Mar 2011 08:51:58 -0700] rev 13752
Fix expected url to match test.
Patrick Mezard <pmezard@gmail.com> [Thu, 24 Mar 2011 10:28:29 +0100] rev 13751
patch: deprecate ui.patch / external patcher feature
Why?
- Mercurial internal patcher works correctly for regular patches and git
patches, is much faster at least on Windows and is more extensible.
- In theory, the external patcher can be used to handle exotic patch formats. I
do not know any and have not heard about any such use in years.
- Most patch programs cannot handle git format patches, which makes the API
caller to decide either to ignore ui.patch by calling patch.internalpatch()
directly, or take the risk of random failures with valid inputs.
- One thing a patch program could do Mercurial patcher cannot is applying with
--reverse. Apparently several shelve like extensions try to use that,
including passing the "reverse" option to Mercurial patcher, which has been
removed mid-2009. I never heard anybody complain about that, and would prefer
reimplementing it anyway.
And from the technical perspective:
- The external patcher makes everything harder to maintain and implement. EOL
normalization is not implemented, and I would bet file renames, if supported
by the patcher, are not correctly recorded in the dirstate.
- No tests.
How?
- Remove related documentation
- Clearly mark patch.externalpatch() as private
- Remove the debuginstall check. This deprecation request was actually
triggered by this last point. debuginstall is the only piece of code patching
without a repository. When migrating to an integrated patch() + updatedir()
call, this was really a showstopper, all workarounds were either ugly or
uselessly complicated to implement. If we do not support external patcher
anymore, the debuginstall check is not useful anymore.
- Remove patch.externalpatch() after 1.9 release.
Matt Mackall <mpm@selenic.com> [Wed, 23 Mar 2011 19:28:16 -0500] rev 13750
# User Dan Villiom Podlaski Christiansen <danchr@gmail.com>
# Date 1289564504 -3600
# Node ID b75264c15cc888cf38c3c7b8f619801e3c2589c7
# Parent 89b2e5d940f669e590096c6be70eee61c9172fff
revsets: overload the branch() revset to also take a branch name.
This should only change semantics in the specific case of a tag/branch
conflict where the tag wasn't done on the branch with the same
name. Previously, branch(whatever) would resolve to the branch of the
tag in that case, whereas now it will resolve to the branch of the
name. The previous behaviour, while documented, seemed very
counter-intuitive to me.
An alternate approach would be to introduce a new revset such as
branchname() or namedbranch(). While this would retain backwards
compatibility, the distinction between it and branch() would not be
readily apparent to users. The most intuitive behaviour would be to
have branch(x) require 'x' to be a branch name, and something like
branchof(x) or samebranch(x) do what branch(x) currently
does. Unfortunately, our backwards compatibility guarantees prevent us
from doing that.
Please note that while 'hg tag' guards against shadowing a branch, 'hg
branch' does not. Besides, even if it did, that wouldn't solve the
issue of conversions with such tags and branches...
Adrian Buehlmann <adrian@cadifra.com> [Wed, 23 Mar 2011 22:58:40 +0100] rev 13749
test-commit-multiple.t: improve committwice.py
- fix bug in replacebyte: parameter fn wasn't used (no harm done)
- remove unneeded matcher
- remove unused local n
- increase test coverage a bit with a second file and some sleeping
- show files changed in revisions
- move print statements out of racy path to make sure it's as racy as possible
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Wed, 23 Mar 2011 23:05:32 +0100] rev 13748
osutil: replace #import with #include, and add a check for it
Patrick Mezard <pmezard@gmail.com> [Wed, 23 Mar 2011 23:33:14 +0100] rev 13747
code indentation fixes
Edouard Gomez <ed.gomez@free.fr> [Wed, 07 Jul 2010 00:06:59 +0200] rev 13746
convert: add bookmark support to the hg sink
Edouard Gomez <ed.gomez@free.fr> [Wed, 07 Jul 2010 00:06:59 +0200] rev 13745
convert: add bookmark support to main command
During conversion, read bookmarks from source repo, filter them and push the
resulting set of bookmarks to destination sink.
Edouard Gomez <ed.gomez@free.fr> [Wed, 07 Jul 2010 00:06:59 +0200] rev 13744
convert: add bookmark support to common sink/source implementation
Adrian Buehlmann <adrian@cadifra.com> [Wed, 23 Mar 2011 11:22:29 +0100] rev 13743
dirstate: reset _lastnormal and _lastnormaltime
on write, invalidate, and clear
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Wed, 23 Mar 2011 16:06:55 +0100] rev 13742
discovery: avoid discovery when local graph is a subset of remote
Immediately sends local's heads to the server to check whether the server knows them all.
If it does, we can call getbundle immediately.
Interesting test output changes are:
- added 1 changesets with 0 changes to 1 files (+1 heads)
+ added 1 changesets with 0 changes to 0 files (+1 heads)
-> The new getbundle() actually fixes a bug vs. changegroupsubset() in that it no longer
returns unnecessary files when file revs are reused.
warning: repository is unrelated
+ requesting all changes
-> The new use of common instead of bases correctly indicates that an unrelated pull
gets all changes from the server.
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Wed, 23 Mar 2011 16:02:11 +0100] rev 13741
wireproto: add getbundle() function
getbundle(common, heads) -> bundle
Returns the changegroup for all ancestors of heads which are not ancestors of common. For both
sets, the heads are included in the set.
Intended to eventually supercede changegroupsubset and changegroup. Uses heads of common region
to exclude unwanted changesets instead of bases of desired region, which is more useful and
easier to implement.
Designed to be extensible with new optional arguments (which will have to be guarded by
corresponding capabilities).
Matt Mackall <mpm@selenic.com> [Wed, 23 Mar 2011 12:38:36 -0500] rev 13740
merge with stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 23 Mar 2011 13:58:33 -0300] rev 13739
i18n-pt_BR: synchronized with 6783f47d90dd
Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 23 Mar 2011 11:57:10 -0300] rev 13738
merge with i18n
Stefano Tortarolo <stefano.tortarolo@gmail.com> [Mon, 14 Mar 2011 23:48:17 +0100] rev 13737
i18n-it: synchronized with adf3c4401c5d
Matt Mackall <mpm@selenic.com> [Wed, 23 Mar 2011 09:41:58 -0500] rev 13736
osutil: fix up check-code issues
Matt Mackall <mpm@selenic.com> [Wed, 23 Mar 2011 09:34:22 -0500] rev 13735
dirstate: flush _lastnormal when we see newer filesystem times
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Wed, 23 Mar 2011 09:43:34 +0100] rev 13734
util: add Mac-specific check whether we're in a GUI session (issue2553)
The previous test assumed that 'os.name' was "mac" on Mac OS X. This
is not the case; 'mac' was classic Mac OS, whereas Mac OS X has 'os.name'
be 'posix'.
Please note that this change will break Mercurial on hypothetical
non-Mac OS X deployments of Darwin.
Credit to Brodie Rao for thinking of CGSessionCopyCurrentDictionary()
and Kevin Bullock for testing.
Stefano Tortarolo <stefano.tortarolo@gmail.com> [Wed, 23 Mar 2011 01:14:43 +0100] rev 13733
rebase: allow for rebasing descendants onto ancestors on different named branches
So far we've been denying rebasing descendants onto ancestors, but there are
situations in which this kind of operation makes perfect sense to me.
Let's say we have made a commit (or more), that belongs to branch 'dev', on
top of the named branch 'stable':
... a (stable) - b (dev)
but then we realize that b should belong to branch 'stable'.
In these cases a rebase means: "move these csets from named branch A to named
branch B" and there isn't a valid reason to deny it.
This patch basically doesn't block it, if source and destination are
on different named branches.
The old behaviour still applies for rebases across the same named branch.
Can you think of any tricky corner cases in which this new behaviour could
lead to problems? (I bet there are tons of them...)
By the way, I created a brand new .t because I feel there should be more
tests I can't think of at the moment.
Markus F.X.J. Oberhumer <markus@oberhumer.com> [Wed, 23 Mar 2011 02:33:24 +0100] rev 13732
bdiff.c: rename all variables which hold a hash value to "hash"
Markus F.X.J. Oberhumer <markus@oberhumer.com> [Wed, 23 Mar 2011 02:33:23 +0100] rev 13731
bdiff.c: use unsigned arithmetic for hash computation
Signed integer overflow is undefined in C.
Markus F.X.J. Oberhumer <markus@oberhumer.com> [Wed, 23 Mar 2011 02:33:22 +0100] rev 13730
bdiff.c: cast to unsigned char when computing hash value
Markus F.X.J. Oberhumer <markus@oberhumer.com> [Wed, 23 Mar 2011 02:33:21 +0100] rev 13729
bdiff.c: make all local functions static
Matt Mackall <mpm@selenic.com> [Wed, 23 Mar 2011 09:20:40 -0500] rev 13728
merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 22 Mar 2011 21:27:51 -0500] rev 13727
debugbundle: fix up long line caught by check-code
Matt Mackall <mpm@selenic.com> [Tue, 22 Mar 2011 21:26:19 -0500] rev 13726
wireproto: avoid naked excepts
Stefano Tortarolo <stefano.tortarolo@gmail.com> [Tue, 15 Mar 2011 14:55:16 +0100] rev 13725
mq: fix typo in docstring
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Tue, 22 Mar 2011 09:22:29 +0100] rev 13724
commands: add debugbundle command
Lists ids contained in a bundle file. Useful for testing bundle-related commands.
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Tue, 22 Mar 2011 09:22:21 +0100] rev 13723
wireproto: add known([id]) function
known([Node]) -> [1/0]
Returns 1/0 for each node, indicating whether it's known by the server.
Needed for new discovery protocols introduced in later patches.
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Tue, 22 Mar 2011 07:40:02 +0100] rev 13722
wireproto: fix decodelist to properly return empty list
Needed by tests for next patch introducing known().
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Tue, 22 Mar 2011 07:38:32 +0100] rev 13721
wireproto: fix handling of '*' args for HTTP and SSH
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Tue, 22 Mar 2011 07:38:32 +0100] rev 13720
debug: add debugwireargs to test argument passing over the wire
Tests argument passing locally, via HTTP, and via SSH. This is mainly preparation
for the next patch.
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Tue, 22 Mar 2011 07:37:56 +0100] rev 13719
sshserver: drop unnecessary line
Matt Mackall <mpm@selenic.com> [Tue, 22 Mar 2011 12:00:38 -0500] rev 13718
merge: avoid unlinking destination of merge when case changes (issue2715)
Matt Mackall <mpm@selenic.com> [Tue, 22 Mar 2011 11:59:43 -0500] rev 13717
dirstate: introduce a public case normalizing method
Matt Mackall <mpm@selenic.com> [Sun, 20 Mar 2011 20:25:41 -0500] rev 13716
changegroup: minor cleanups
Matt Mackall <mpm@selenic.com> [Sun, 20 Mar 2011 20:21:19 -0500] rev 13715
repair: revlog has an iterator
Matt Mackall <mpm@selenic.com> [Sun, 20 Mar 2011 20:17:57 -0500] rev 13714
changegroup: fix leftover from delta read
Matt Mackall <mpm@selenic.com> [Sun, 20 Mar 2011 20:16:51 -0500] rev 13713
changegroup: drop expensive redundant usage of readdelta for progress
Matt Mackall <mpm@selenic.com> [Sun, 20 Mar 2011 19:43:28 -0500] rev 13712
changegroupsubset: use manifest.readfast to simplify collector
Matt Mackall <mpm@selenic.com> [Sun, 20 Mar 2011 19:43:28 -0500] rev 13711
manifest: add readfast method
Matt Mackall <mpm@selenic.com> [Sun, 20 Mar 2011 19:43:28 -0500] rev 13710
changegroupsubset: simplify filenode_collector
Matt Mackall <mpm@selenic.com> [Sun, 20 Mar 2011 19:43:28 -0500] rev 13709
changegroupsubset: more renaming
Matt Mackall <mpm@selenic.com> [Sun, 20 Mar 2011 19:43:28 -0500] rev 13708
changegroupsubset: simplify prune
Ancestors of nodes linked to commonrevs can be expected to be linked
to commonrevs. Walking graphs of each revlog looking for rare/nonexistent outliers is overkill.
Matt Mackall <mpm@selenic.com> [Sun, 20 Mar 2011 19:43:28 -0500] rev 13707
changegroupsubset: more minor cleanups
- remove more excessive comments
- simplify some sorting operations
- rename some variables
- replace identity with a lambda
Matt Mackall <mpm@selenic.com> [Sun, 20 Mar 2011 19:43:28 -0500] rev 13706
changegroupsubset: minor cleanups
- move some variable declarations
- drop some excessive comments
- use standard variable naming
Matt Mackall <mpm@selenic.com> [Sun, 20 Mar 2011 19:43:28 -0500] rev 13705
strip: simplify collectone
Greg Ward <greg@gerg.ca> [Sun, 20 Mar 2011 17:41:09 -0400] rev 13704
dirstate: avoid a race with multiple commits in the same process
(issue2264, issue2516)
The race happens when two commits in a row change the same file
without changing its size, *if* those two commits happen in the same
second in the same process while holding the same repo lock. For
example:
commit 1:
M a
M b
commit 2: # same process, same second, same repo lock
M b # modify b without changing its size
M c
This first manifested in transplant, which is the most common way to
do multiple commits in the same process. But it can manifest in any
script or extension that does multiple commits under the same repo
lock. (Thus, the test script tests both transplant and a custom script.)
The problem was that dirstate.status() failed to notice the change to
b when localrepo is about to do the second commit, meaning that change
gets left in the working directory. In the context of transplant, that
means either a crash ("RuntimeError: nothing committed after
transplant") or a silently inaccurate transplant, depending on whether
any other files were modified by the second transplanted changeset.
The fix is to make status() work a little harder when we have
previously marked files as clean (state 'normal') in the same process.
Specifically, dirstate.normal() adds files to self._lastnormal, and
other state-changing methods remove them. Then dirstate.status() puts
any files in self._lastnormal into state 'lookup', which will make
localrepository.status() read file contents to see if it has really
changed. So we pay a small performance penalty for the second (and
subsequent) commits in the same process, without affecting the common
case. Anything that does lots of status updates and checks in the
same process could suffer a performance hit.
Incidentally, there is a simpler fix: call dirstate.normallookup() on
every file updated by commit() at the end of the commit. The trouble
with that solution is that it imposes a performance penalty on the
common case: it means the next status-dependent hg command after every
"hg commit" will be a little bit slower. The patch here is more
complex, but only affects performance for the uncommon case.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 20 Mar 2011 01:16:57 +0100] rev 13703
changegroupsubset: extranodes are no longer needed
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 20 Mar 2011 00:50:22 +0100] rev 13702
strip: remove usage of extranodes
Instead of computing the exact set of missing revlog revisions, we only
compute the set of missing/broken changesets. The resulting bundle can be
slightly bigger but we will be able to get rid of the ugly extranodes handling
in changegroupsubset.
Patrick Mezard <pmezard@gmail.com> [Sun, 20 Mar 2011 00:22:47 +0100] rev 13701
patch: move closefile() into patchfile.close()
Patrick Mezard <pmezard@gmail.com> [Sun, 20 Mar 2011 00:09:44 +0100] rev 13700
patch: inline patchfile.hashlines()
Patrick Mezard <pmezard@gmail.com> [Sun, 20 Mar 2011 00:08:44 +0100] rev 13699
patch: fix hunk newlines when parsing hunks, not in iterhunks()
Patrick Mezard <pmezard@gmail.com> [Sat, 19 Mar 2011 19:50:55 +0100] rev 13698
i18n: register new template keywords for translation
Matt Mackall <mpm@selenic.com> [Sat, 19 Mar 2011 01:34:49 -0500] rev 13697
annotate: catch nonexistent files using match.bad callback (issue1590)
Steve Borho <steve@borho.org> [Fri, 18 Mar 2011 13:01:18 -0500] rev 13696
merge with stable
Steve Borho <steve@borho.org> [Fri, 18 Mar 2011 11:36:36 -0500] rev 13695
wix: add new file templates/paper/bookmarks.tmpl
This file was snuck onto the stable branch with 38c9837b1f75
Matt Mackall <mpm@selenic.com> [Thu, 17 Mar 2011 17:08:13 -0500] rev 13694
merge with stable
Miloš Hadžić <milos.hadzic@gmail.com> [Thu, 17 Mar 2011 22:55:02 +0100] rev 13693
push/outgoing: print remote target path even if there's an error (issue2561)
This is a simple patch to make hg push/hg outgoing print their remote target
path even if the operation fails. I'm not sure if the original behavior was by
design.
This patch also changes one test to reflect the changed behaviour.
Eric Eisner <ede@mit.edu> [Thu, 17 Mar 2011 16:29:09 -0400] rev 13692
subrepo: recognize scp-style paths as git URLs
Patrick Mezard <pmezard@gmail.com> [Thu, 17 Mar 2011 22:17:27 +0100] rev 13691
convert: add svnrev, svnpath and svnuuid template keywords
$ hg -R A-hg log --template '{rev} {svnuuid}{svnpath}@{svnrev}\n'
10 644ede6c-2b81-4367-9dc8-d786514f2cde/trunk@10
Patrick Mezard <pmezard@gmail.com> [Thu, 17 Mar 2011 22:17:27 +0100] rev 13690
convert/svn: extract revsplit() in a function
Patrick Mezard <pmezard@gmail.com> [Thu, 17 Mar 2011 22:17:27 +0100] rev 13689
transplant: add "transplanted" keyword
$ hg log --template '{rev} {transplanted}\n'
7 a53251cdf717679d1907b289f991534be05c997a
Matt Mackall <mpm@selenic.com> [Thu, 17 Mar 2011 12:00:49 -0500] rev 13688
merge with i18n
Martin Geisler <mg@lazybytes.net> [Wed, 16 Mar 2011 17:43:43 +0100] rev 13687
i18n: merge with stable
Martin Geisler <mg@lazybytes.net> [Wed, 16 Mar 2011 17:42:42 +0100] rev 13686
i18n-da: synchronize with e9628665b670
Martin Geisler <mg@lazybytes.net> [Wed, 16 Mar 2011 17:38:25 +0100] rev 13685
i18n: don't mark trivial string for translation
Martin Geisler <mg@lazybytes.net> [Wed, 16 Mar 2011 17:34:13 +0100] rev 13684
i18n: merge with mpm
David Soria Parra <dsp@php.net> [Tue, 15 Mar 2011 10:39:19 +0100] rev 13683
i18n-de: correct translation for some fuzzy strings
David Soria Parra <dsp@php.net> [Tue, 15 Mar 2011 10:20:55 +0100] rev 13682
i18n-de: synchronize with 994510694b1d
thron7 <thron7@users.sourceforge.net> [Sun, 13 Mar 2011 15:35:23 +0100] rev 13681
i18n-de: added translations concerning hardlinks
thron7 <thron7@users.sourceforge.net> [Sun, 13 Mar 2011 15:18:17 +0100] rev 13680
i18n-de: added more translations concerning rebase
thron7 <thron7@users.sourceforge.net> [Sun, 13 Mar 2011 14:16:15 +0100] rev 13679
i18n-de: added translations concerning rebase
thron7 <thron7@users.sourceforge.net> [Sun, 13 Mar 2011 13:04:06 +0100] rev 13678
i18n-de: added translations concerning email sending
thron7 <thron7@users.sourceforge.net> [Sun, 13 Mar 2011 12:52:22 +0100] rev 13677
i18n-de: added translations concerning patches
thron7 <thron7@users.sourceforge.net> [Sun, 13 Mar 2011 12:21:46 +0100] rev 13676
i18n-de: added translations concerning win32text and .hgeol
thron7 <thron7@users.sourceforge.net> [Sun, 13 Mar 2011 11:38:27 +0100] rev 13675
i18n-de: added translations for Perforce conversion options
thron7 <thron7@users.sourceforge.net> [Sat, 12 Mar 2011 18:54:43 +0100] rev 13674
i18n-de: added translations for Subversion conversion options
thron7 <thron7@users.sourceforge.net> [Sat, 12 Mar 2011 18:32:02 +0100] rev 13673
i18n-de: added translation for CVS conversion options
thron7 <thron7@users.sourceforge.net> [Sat, 12 Mar 2011 17:42:17 +0100] rev 13672
i18n-de: added translations for convert.hg.* options
thron7 <thron7@users.sourceforge.net> [Sat, 12 Mar 2011 17:42:17 +0100] rev 13671
i18n-de: translate some strings
Markus F.X.J. Oberhumer <markus@oberhumer.com> [Wed, 16 Mar 2011 23:54:55 +0100] rev 13670
revset: fix a number of highly dubious continue statements
This patch definitely needs a review and would also benefit from
some new testsuite entries.
Markus F.X.J. Oberhumer <markus@oberhumer.com> [Wed, 16 Mar 2011 23:54:55 +0100] rev 13669
graphlog: do not swallow all TypeError exceptions (fix 29c800ee54cf)
Markus F.X.J. Oberhumer <markus@oberhumer.com> [Wed, 16 Mar 2011 23:54:55 +0100] rev 13668
archive: use hardcoded constants when creating .zip archives
Do not rely on local stat constants, which may differ.
timeless <timeless@gmail.com> [Wed, 16 Mar 2011 03:06:57 +0100] rev 13667
hgweb: support multiple directories for the same path
[paths]
/dir = /path/1/*, /path/2/*
timeless <timeless@gmail.com> [Wed, 16 Mar 2011 03:28:56 +0100] rev 13666
templates: provide granularity for future values for age filter
Bernhard Leiner <bleiner@gmail.com> [Wed, 16 Mar 2011 23:09:14 +0100] rev 13665
revset: report a parse error if a revset is not parsed completely (issue2654)
Adrian Buehlmann <adrian@cadifra.com> [Wed, 16 Mar 2011 18:48:59 +0100] rev 13664
config: use util.posixfile
David Soria Parra <dsp@php.net> [Mon, 14 Mar 2011 23:03:56 +0100] rev 13663
bundle: update current bookmark to most recent revision on current branch
We check if the current bookmark is set to the first parent of the
dirstate. Is this the case we move the bookmark to most recent revision
on the current branch (where hg update will update you to).
David Soria Parra <dsp@php.net> [Mon, 14 Mar 2011 20:53:55 +0100] rev 13662
localrepo: do not update bookmarks in addchangegroup
We want to update the current bookmark to the most recent revision on
current branch unless there is a remote bookmark that points to
a different descendant. Addchangegroup is called before we can check for
remote bookmarks.
We don't update the bookmark in addchangegroup anymore to allow proper updating
of bookmarks in pull.
Radomir Dopieralski <sheep@stxnext.pl> [Tue, 15 Mar 2011 18:33:36 +0100] rev 13661
rebase: add -m/--message to rebase --collapse (issue2389)
When collapsing changesets with rebase, you get a chance to edit the commit
message manually, but there is no way to pass this message from the command
line. This patch adds a `--message` (with short form `-m`) and `--logfile`
(with short form `-m`) options to the rebase command. These options suppresses
the generation of the default commit message, and instead use the message
provided in the option (in case of `-m`) or in the file it points to (in case
of `-l`).
If you use this option without the `--collapse` option, it will raise an
error.
Options documentation edited by Patrick Mezard <pmezard@gmail.com>
David Wolever <david@wolever.net> [Tue, 15 Mar 2011 17:50:02 -0400] rev 13660
Updating hgext.extdiff to use revsets
Martin Geisler <mg@lazybytes.net> [Wed, 16 Mar 2011 16:07:06 +0100] rev 13659
merge with stable
Martin Geisler <mg@lazybytes.net> [Wed, 16 Mar 2011 15:34:45 +0100] rev 13658
relink: mark abort message for translation
Martin Geisler <mg@lazybytes.net> [Wed, 16 Mar 2011 15:34:10 +0100] rev 13657
relink: avoid trying to lock the same repo twice
Martin Geisler <mg@lazybytes.net> [Wed, 16 Mar 2011 13:51:47 +0100] rev 13656
relink: format reclaimed byte count nicely
Martin Geisler <mg@lazybytes.net> [Wed, 16 Mar 2011 13:25:12 +0100] rev 13655
test-relink: remove unnecessary ui.username setting
David Soria Parra <dsp@php.net> [Wed, 16 Mar 2011 09:05:59 +0100] rev 13654
test-https: match output from 31eac42d9123
Matt Mackall <mpm@selenic.com> [Tue, 15 Mar 2011 16:53:46 -0500] rev 13653
merge with stable
Patrick Mezard <pmezard@gmail.com> [Mon, 14 Mar 2011 22:37:50 +0100] rev 13652
merge with crew
Patrick Mezard <pmezard@gmail.com> [Mon, 14 Mar 2011 21:35:31 +0100] rev 13651
convert/svn: fix _iterfiles() output in root dir case (issue2647)
When converting directory additions/replacement with project directory set to
root, _iterfiles() sometimes returned paths starting with a slash making
following svn calls to fail.
I could not reproduce the issue with hand-crafted repositories.
Report and first analysis by Clinton Chau <clinton@clearcanvas.ca>
Patrick Mezard <pmezard@gmail.com> [Mon, 14 Mar 2011 21:31:54 +0100] rev 13650
eol: no need to accumulate files when checking all changesets
Just check the files touched by the changesets.
Patrick Mezard <pmezard@gmail.com> [Mon, 14 Mar 2011 21:08:18 +0100] rev 13649
eol: improve hook failure output
Before, only the first failure was reported:
abort: b.txt should not have CRLF line endings
while now all of them are listed:
abort: end-of-line check failed:
d.txt in a7040e68714f should not have CRLF line endings
b.txt in fbcf9b1025f5 should not have CRLF line endings
As first suggested by Antoine Pitrou <solipsis@pitrou.net>
Matt Mackall <mpm@selenic.com> [Mon, 14 Mar 2011 15:59:44 -0500] rev 13648
merge with stable
David Soria Parra <dsp@php.net> [Mon, 14 Mar 2011 09:36:17 +0100] rev 13647
bookmarks: remove API limitation in setcurrent
setcurrent refuses to set a new current bookmark if the current bookmark
points to the current dirstate. This restriction is not needed. A current
bookmark can point to a different bookmark.
David Soria Parra <dsp@php.net> [Mon, 14 Mar 2011 00:10:43 +0100] rev 13646
bookmarks: separate bookmarks update code from localrepo's pull.
We explicitly want to update bookmarks from a remote. This will avoid
duplicate calls to listkeys if we clone (which calls pull) and keep
bookmark related code together.
David Soria Parra <dsp@php.net> [Sun, 13 Mar 2011 14:35:17 +0100] rev 13645
tests: add tests for bookmarks support in hg identify
Nils Adermann <naderman@naderman.de> [Sat, 12 Mar 2011 18:15:14 +0100] rev 13644
identify: list bookmarks for remote repositories
Craig Leres <leres@ee.lbl.gov> [Mon, 14 Mar 2011 12:42:05 -0400] rev 13643
hgignore: ignore dll files generated under cygwin
Brodie Rao <brodie@bitheap.org> [Tue, 04 Jan 2011 00:24:34 +1100] rev 13642
pager: don't page stderr if it's being redirected (issue2541)
Adrian Buehlmann <adrian@cadifra.com> [Fri, 11 Mar 2011 11:14:21 +0100] rev 13641
color: port to using ctypes (issue2687)
replacing usage of pywin32, which was removed for Mercurial 1.8
Matt Mackall <mpm@selenic.com> [Mon, 14 Mar 2011 15:28:56 -0500] rev 13640
hgweb: drop use of super() for Exception base class
In Python 2.4, Exception is an old-style class and doesn't work with super.
Steve Borho <steve@borho.org> [Mon, 14 Mar 2011 13:11:26 -0500] rev 13639
diff: make diff -c aware of revision sets
Martin Geisler <mg@aragost.com> [Mon, 14 Mar 2011 15:19:58 +0100] rev 13638
color: wrap lines in docstring
Martin Geisler <mg@aragost.com> [Mon, 14 Mar 2011 14:05:19 +0100] rev 13637
merge with stable
Jon M. Dugan <jdugan@x1024.net> [Sun, 13 Mar 2011 17:39:33 -0500] rev 13636
setup: fix mac build broken by e42d18538e1d
Sometimes xcodebuild prints warnings to stderr, but runcmd() assumes anything
printed to stderr implies failure. Since runcmd() was originally only
intended to run hg, this was fine until it was pressed into service for
running xcodebuild. Thus: split runcmd() into two parts: runcmd(), which does
the minimal amount of work to run a subprocess, and runhg(), which calls
runcmd().
Martin Geisler <mg@aragost.com> [Mon, 14 Mar 2011 13:54:25 +0100] rev 13635
color: don't mention internal function in docstring
The render_text function actually never existed, the docstring
probably meant the render_effects function instead.
Christian Ebert <blacktrash@gmx.net> [Mon, 14 Mar 2011 12:26:50 +0100] rev 13634
keyword: offer additional datefilters when the extension is enabled
Before the additional datefilters (utcdate, svnisodate, svnutcdate)
were used when kwtemplater was initialized. Now they always be used
once the extension is enabled.
Christian Ebert <blacktrash@gmx.net> [Mon, 14 Mar 2011 12:19:59 +0100] rev 13633
keyword: docstrings for additional date filters
Martin Geisler <mg@lazybytes.net> [Sun, 13 Mar 2011 16:18:46 +0100] rev 13632
mq: do not let qrefresh write bad patch
Klaus Koch <kuk42@gmx.net> [Sun, 13 Mar 2011 15:04:13 +0100] rev 13631
graphlog: give meaningful error if more than one file is given
Martin Geisler <mg@aragost.com> [Mon, 14 Mar 2011 09:20:21 +0100] rev 13630
merge with stable
Martin Geisler <mg@aragost.com> [Mon, 14 Mar 2011 09:20:05 +0100] rev 13629
test-https: update to match output from 3f6a4579f803
David Soria Parra <dsp@php.net> [Mon, 14 Mar 2011 00:10:43 +0100] rev 13628
tests: respect new hg clone listkey queries in http-proxy test
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 13 Mar 2011 14:36:47 +0100] rev 13627
bookmarks: discard current bookmark if absent from the bookmarks (issue2692)
After a rollback, the current bookmark might be absent from the bookmarks
file. In that case we discard it instead of displaying a traceback during
commit.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 13 Mar 2011 16:13:25 +0100] rev 13626
fix test-highlight after bookmark support change for hgweb
Steve Borho <steve@borho.org> [Sun, 13 Mar 2011 10:09:30 -0500] rev 13625
merge with stable
Steve Borho <steve@borho.org> [Sun, 13 Mar 2011 10:03:06 -0500] rev 13624
eol: do not abort when win32text is found, only warn
The win32text extension does not break eol or vice-versa, so it is not a fatal
error to have both of them enabled. It's just folly. So spewing warnings in
this condition is preferrable to aborting. When both extensions are enabled,
the user now sees:
% hg st
the eol extension is incompatible with the win32text extension
win32text is deprecated: http://mercurial.selenic.com/wiki/Win32TextExtension
M hgext/eol.py
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 13 Mar 2011 15:59:50 +0100] rev 13623
merge with stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sun, 13 Mar 2011 15:59:24 +0100] rev 13622
tests: fix failures introduced in 7359cb753a54
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 12 Mar 2011 11:06:40 +0100] rev 13621
tests: fix permission issue trying to remove test directory
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 13 Mar 2011 15:42:24 +0100] rev 13620
bookmarks: fix update of the current bookmark during rename
We need to get rid of the previous bookmark after changing current bookmark.
Steve Borho <steve@borho.org> [Sun, 13 Mar 2011 08:50:06 -0500] rev 13619
setup: remove unnecessary code for win32com (pywin32)
Patrick Mezard <pmezard@gmail.com> [Sun, 13 Mar 2011 15:10:01 +0100] rev 13618
test-highlight: fix test output (introduced by 2151703e7f84)
Patrick Mezard <pmezard@gmail.com> [Sun, 13 Mar 2011 15:07:44 +0100] rev 13617
eol: rename hook into checkheadshook, add checkallhook (issue2665)
"hook" is still an alias for "checkheadshook".
Patrick Mezard <pmezard@gmail.com> [Sun, 13 Mar 2011 15:07:44 +0100] rev 13616
eol: make the hook check all new heads, not only tip (issue2666)
Report and test by Antoine Pitrou <solipsis@pitrou.net>
Patrick Mezard <pmezard@gmail.com> [Sun, 13 Mar 2011 15:07:44 +0100] rev 13615
eol: the hook no longer requires the extension to be loaded
Reading rules in the hook means we no longer need ui to be filled and do not
need reposetup() to be run anymore.
Patrick Mezard <pmezard@gmail.com> [Sun, 13 Mar 2011 15:07:44 +0100] rev 13614
eol: extract parsing error handling in parseeol()
Patrick Mezard <pmezard@gmail.com> [Sun, 13 Mar 2011 15:07:44 +0100] rev 13613
eol: separate .hgeol parsing from merge in ui
This will help refactoring the hook.
Patrick Mezard <pmezard@gmail.com> [Sun, 13 Mar 2011 15:07:44 +0100] rev 13612
eol: remove unused argument in readhgeol()
Patrick Mezard <pmezard@gmail.com> [Sun, 13 Mar 2011 15:07:44 +0100] rev 13611
eol: explain why reading .hgeol from the working dir is special
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sun, 13 Mar 2011 14:26:32 +0100] rev 13610
templates: widen the graph canvas (issue2683)
Martin Geisler <mg@lazybytes.net> [Sun, 13 Mar 2011 13:52:47 +0100] rev 13609
rebase: don't use util.Abort for an internal error
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sun, 13 Mar 2011 13:38:44 +0100] rev 13608
help: limit documentation width to at most 80 characters
Reading long lines is suboptimal no matter how wide the terminal is.
Martin Geisler <mg@lazybytes.net> [Sun, 13 Mar 2011 13:05:16 +0100] rev 13607
merge with stable
Martin Geisler <mg@lazybytes.net> [Sun, 13 Mar 2011 12:44:35 +0100] rev 13606
transplant: avoid the word "rebase" when we mean "transplant"
Martin Geisler <mg@lazybytes.net> [Sun, 13 Mar 2011 12:43:52 +0100] rev 13605
transplant: explain that changesets are copied, not moved
David Soria Parra <dsp@php.net> [Sun, 13 Mar 2011 12:24:17 +0100] rev 13604
hg: add support for cloning bookmarks
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Sat, 12 Mar 2011 18:29:02 +0100] rev 13603
httprepo: use caps instead of between for compat check
We usually query the capabilities at some point anyway so this way the first roundtrip
actually does useful work.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 12 Mar 2011 18:48:30 +0100] rev 13602
revset: add a revset command to get bisect state.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 12 Mar 2011 17:08:42 +0100] rev 13601
bisect: new command to extend the bisect range (issue2690)
When bisect ends in a merge point, and one of the parent wasn't checked,
this usually means the culprit is in a branch that wasn't scanned.
For this case we provide a new command which extends the range of the bisect
search to the common ancestor of the parents of the merge.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 12 Mar 2011 16:00:54 +0100] rev 13600
hgweb: pmezard thinks one default is enough
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 12 Mar 2011 15:51:39 +0100] rev 13599
don't depend on features of Exception as much
BaseException.message has been deprecated, so we try to not rely on it.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 12 Mar 2011 15:21:45 +0100] rev 13598
deal with empty Content-Length headers
Alexander Solovyov <alexander@solovyov.net> [Sat, 12 Mar 2011 11:20:03 +0100] rev 13597
hgweb: add separate page with bookmarks listing
Alexander Solovyov <alexander@solovyov.net> [Sat, 12 Mar 2011 11:19:44 +0100] rev 13596
hgweb: add display of bookmarks for changelog and changeset
Martin Geisler <mg@lazybytes.net> [Sat, 12 Mar 2011 13:06:50 +0100] rev 13595
merge with stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 12 Mar 2011 13:02:03 +0100] rev 13594
setup.py: use StrictVersion instead of manual comparison
Patrick Mezard <pmezard@gmail.com> [Sat, 12 Mar 2011 12:46:31 +0100] rev 13593
help: extract items doc generation function
Patrick Mezard <pmezard@gmail.com> [Sat, 12 Mar 2011 12:46:31 +0100] rev 13592
templates: document missing keywords or filters
Keywords keywords are not documented yet but are turned into function
definitions to avoid lambda docstring weirdness.
Patrick Mezard <pmezard@gmail.com> [Sat, 12 Mar 2011 12:46:31 +0100] rev 13591
templatefilters: move doc from templates.txt to docstrings
Patrick Mezard <pmezard@gmail.com> [Sat, 12 Mar 2011 12:46:31 +0100] rev 13590
templatefilters: wrap all filters in dedicated functions
This will highly simplify the docstring integration. I measured "hg log
--style=changelog" duration on mercurial itself and could not detect any
difference.
Patrick Mezard <pmezard@gmail.com> [Sat, 12 Mar 2011 12:46:31 +0100] rev 13589
templatefilters: prefix helper functions
Patrick Mezard <pmezard@gmail.com> [Sat, 12 Mar 2011 12:46:31 +0100] rev 13588
templatefilters: sort function definitions
Patrick Mezard <pmezard@gmail.com> [Sat, 12 Mar 2011 12:46:31 +0100] rev 13587
templatefilters: match filter keys and function names
Patrick Mezard <pmezard@gmail.com> [Sat, 12 Mar 2011 12:46:31 +0100] rev 13586
templatefilters: sort filters table
Patrick Mezard <pmezard@gmail.com> [Sat, 12 Mar 2011 12:46:31 +0100] rev 13585
templates: generate keyword help dynamically
Patrick Mezard <pmezard@gmail.com> [Sat, 12 Mar 2011 12:46:31 +0100] rev 13584
test-help: test a sample of 'templates' topic help
Alexander Solovyov <alexander@solovyov.net> [Sat, 12 Mar 2011 12:42:20 +0100] rev 13583
fix compiling of extensions for OS X and XCode 4.0
Martin Geisler <mg@lazybytes.net> [Sat, 12 Mar 2011 12:15:36 +0100] rev 13582
test-subrepo-paths: fix typo
Martin Geisler <mg@lazybytes.net> [Sat, 12 Mar 2011 12:11:09 +0100] rev 13581
eol: use dirstate methods to clear dirstate
This fixes a race that was observed when status was called before and
after clearing the dirstate.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 12 Mar 2011 11:06:40 +0100] rev 13580
tests: fix permission issue trying to remove test directory
Luke Plant <L.Plant.98@cantab.net> [Fri, 11 Mar 2011 15:48:44 +0000] rev 13579
transplant: added 'HGREVISION' variable to the environment passed to the 'filter' command
Sometimes it is necessary to know the original revision ID in order to
correctly rewrite the patch or commit message when transplanting. This
patch follows the pattern set by the existing 'HGUSER' environment variable,
and adds a test that covers both HGUSER and HGREVISION.
Martin Geisler <mg@aragost.com> [Fri, 11 Mar 2011 12:42:07 +0100] rev 13578
test-subrepo-paths: test cummulative remapping
Martin Geisler <mg@aragost.com> [Fri, 11 Mar 2011 12:35:41 +0100] rev 13577
merge with stable
Martin Geisler <mg@aragost.com> [Thu, 10 Mar 2011 16:49:37 +0100] rev 13576
ui: yield unchanged values in walkconfig
Ever since walkconfig was introduced back in 25e7ea0f2cff, the values
yielded has been mutated by replacing "\n" with "\\n". This makes
walkconfig less useful than it could and there is no other way to
iterate over all config sections.
The third-party reposettings extension used ui.walkconfig but did not
take the replacement into account -- this change will actually fix a
bug in the extension when a value contains a newline.
Matt Mackall <mpm@selenic.com> [Thu, 10 Mar 2011 11:30:38 -0600] rev 13575
Added signature for changeset aa1f3be38ab1
Matt Mackall <mpm@selenic.com> [Thu, 10 Mar 2011 11:30:34 -0600] rev 13574
Added tag 1.8.1 for changeset aa1f3be38ab1
Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 09 Mar 2011 15:29:50 -0300] rev 13573
i18n-pt_BR: synchronized with 66d65bccbf06
Martin Geisler <mg@aragost.com> [Thu, 10 Mar 2011 13:43:47 +0100] rev 13572
tests: use $TESTTMP more and use (glob) less
This locks down the test output a little more.
Augie Fackler <durin42@gmail.com> [Fri, 07 Jan 2011 15:19:21 -0600] rev 13571
hgweb_mod: respond right away if the client specified 100-continue support
Clients that send 100-continue should make sure they really support
continue intelligently. In a later patch we'll introduce a capability so
new clients don't pay a performance penalty talking to old servers.
Augie Fackler <durin42@gmail.com> [Sat, 06 Feb 2010 04:27:28 -0600] rev 13570
hgweb: add support for 100-continue as recommended by PEP 333.
Eric Eisner <ede@mit.edu> [Tue, 08 Mar 2011 15:36:56 -0500] rev 13569
subrepo: show the source that git pulls
Mark Drago <markdrago@gmail.com> [Tue, 08 Mar 2011 08:41:39 -0500] rev 13568
commands.update() now works properly with a revision of 0
Without this change commands.update() treats an integer 0 as if no revision
was passed and updates to the branch head. This fix allows an integer 0 to
be detected as a revision number so the working directory is correctly
changed to revision 0 rather than the branch head.
Steve Borho <steve@borho.org> [Tue, 08 Mar 2011 14:55:31 -0600] rev 13567
merge with stable
Steve Borho <steve@borho.org> [Tue, 08 Mar 2011 13:35:01 -0600] rev 13566
mergetools: add alternate registry keys for 32bit apps on 64bit O/S
Not all applications needed the workarounds, so I did not add alternate keys for
every Windows merge application.
Steve Borho <steve@borho.org> [Tue, 08 Mar 2011 13:05:18 -0600] rev 13565
filemerge: introduce a 'regkeyalt' merge tool variable
This allows us to provide alternate search keys for 64bit operating systems that
may have 32bit merge tools installed. Presumably it may find other uses.
Steve Borho <steve@borho.org> [Tue, 08 Mar 2011 10:25:18 -0600] rev 13564
merge with stable
Steve Borho <steve@borho.org> [Tue, 08 Mar 2011 10:03:01 -0600] rev 13563
wix: drop bin/ folder from MSI installers (issue 2673)
Also fixes issue 2658.
Martin Geisler <mg@aragost.com> [Tue, 08 Mar 2011 11:01:01 +0100] rev 13562
zsh completion: remove computed default values from help texts
The default encoding and encoding mode are computed at runtime and can
vary from system to system. The two remaining default values in the
completion help texts (number of directories to strip on import and
default bundle name) are fixed in the source code.
Mads Kiilerich <mads@kiilerich.com> [Tue, 08 Mar 2011 01:21:50 +0100] rev 13561
merge: remove last traces of fastforward merging
bbc97d419b16 introduced fast-forward branch merging.
66ed92ed115a partly removed it again.
The fastforward variable would always be false if branchmerge was false, so the
fastforward variable makes no difference and we can remove it completely.
Patrick Mezard <pmezard@gmail.com> [Mon, 07 Mar 2011 23:19:17 +0100] rev 13560
merge with stable
Patrick Mezard <pmezard@gmail.com> [Mon, 07 Mar 2011 23:02:04 +0100] rev 13559
subrepo: backout 67fbe566eff1, --force requires svn >= 1.5
Matt Mackall <mpm@selenic.com> [Mon, 07 Mar 2011 15:46:46 -0600] rev 13558
merge with stable
Matt Mackall <mpm@selenic.com> [Mon, 07 Mar 2011 15:46:28 -0600] rev 13557
merge with i18n
David Soria Parra <dsp@php.net> [Sun, 06 Mar 2011 15:32:37 +0100] rev 13556
i18n-de: improve translation for "unmerged branches"
This translation issue was pointed out by Georg Brandl.
Steven Brown <StevenGBrown@gmail.com> [Mon, 07 Mar 2011 15:37:11 +0800] rev 13555
httprepo: order URL query string fields for readability
- cmd is always first, since the other fields are arguments to that command.
- The other fields are in alphabetical order, rather than random order.
example "hg serve" output
BEFORE
127.0.0.1 - - [26/Feb/2011 14:20:07] "GET /?bases=fa5962be1d87fe9a57244a14033550e192e57521+1a38f137b190482eaf0986594cd6e6b486c76fec&cmd=changegroupsubset&heads=1a38f137b190482eaf0986594cd6e6b486c76fec+fa5962be1d87fe9a57244a14033550e192e57521 HTTP/1.1" 200 -
127.0.0.1 - - [26/Feb/2011 14:00:50] "GET /?pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000&cmd=between HTTP/1.1" 200 -
127.0.0.1 - - [26/Feb/2011 14:17:28] "GET /?nodes=1a38f137b190482eaf0986594cd6e6b486c76fec+fa5962be1d87fe9a57244a14033550e192e57521&cmd=branches HTTP/1.1" 200 -
AFTER
127.0.0.1 - - [26/Feb/2011 14:21:28] "GET /?cmd=changegroupsubset&bases=fa5962be1d87fe9a57244a14033550e192e57521+1a38f137b190482eaf0986594cd6e6b486c76fec&heads=1a38f137b190482eaf0986594cd6e6b486c76fec+fa5962be1d87fe9a57244a14033550e192e57521 HTTP/1.1" 200 -
127.0.0.1 - - [26/Feb/2011 13:48:13] "GET /?cmd=between&pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 HTTP/1.1" 200 -
127.0.0.1 - - [26/Feb/2011 14:19:17] "GET /?cmd=branches&nodes=1a38f137b190482eaf0986594cd6e6b486c76fec+fa5962be1d87fe9a57244a14033550e192e57521 HTTP/1.1" 200 -
Matt Mackall <mpm@selenic.com> [Mon, 07 Mar 2011 15:45:10 -0600] rev 13554
ancestor: improve description
Eric Eisner <ede@mit.edu> [Mon, 07 Mar 2011 12:03:54 -0500] rev 13553
subrepo: don't crash when git repo is missing
Matt Mackall <mpm@selenic.com> [Mon, 07 Mar 2011 15:44:43 -0600] rev 13552
ancestor: rewrite to deal with crossed linkrevs (issue2682)
This version is about 10% slower, possibly because it visits some
revisions in a different topological order than what's in the revlog.
Georg Brandl <georg@python.org> [Sun, 06 Mar 2011 11:30:57 +0100] rev 13551
hgcia: accept "queued." xmlrpc return as success
Matt Mackall <mpm@selenic.com> [Mon, 07 Mar 2011 15:03:10 -0600] rev 13550
merge: back out single-parent fast-forward merge
This backs out
changeset: 13158:9e7e24052745
user: Mads Kiilerich <mads@kiilerich.com>
date: Tue Dec 07 03:29:21 2010 +0100
summary: merge: fast-forward merge with descendant
Before named branches, the invariants were:
a) "merges" always have two parents
b) p1 is not linearly related to p2
Adding named branches made (b) problematic, so the above patch was
introduced, which fixed (b) but broke (a).
After discussion, we decided that the invariants should be:
a) "merges" always have two parents
b) p1 is not linearly related to p2 OR p1 and p2 are on different branches
Matt Mackall <mpm@selenic.com> [Sat, 05 Mar 2011 16:34:59 -0600] rev 13549
merge: drop resolve state for mergers with identical contents (issue2680)
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Mar 2011 22:13:36 +0100] rev 13548
merge with stable
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Mar 2011 22:03:30 +0100] rev 13547
hgweb: fix filelog rss links generation
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Mar 2011 22:03:18 +0100] rev 13546
hgweb: use tip in gitweb/monoblue filelog rss links (issue2677)
Mads Kiilerich <mads@kiilerich.com> [Sun, 06 Mar 2011 19:38:00 +0100] rev 13545
merge with stable
timeless <timeless@gmail.com> [Sun, 06 Mar 2011 10:27:07 -0600] rev 13544
cacert: improve error report when web.cacert file does not exist
timeless <timeless@gmail.com> [Sun, 06 Mar 2011 05:56:59 -0600] rev 13543
tests: improve hghave error reporting for missing Py OpenSSL
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Mar 2011 15:30:39 +0100] rev 13542
Merge with stable
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Mar 2011 15:21:50 +0100] rev 13541
Improve unresolved merge conflicts warning (issue2681)
Suggested by Antoine Pitrou <pitrou@free.fr>
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Mar 2011 14:38:47 +0100] rev 13540
tests: convert test-serve to new format
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Mar 2011 14:19:57 +0100] rev 13539
run-tests: handle mixed comment lines in blacklists
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Mar 2011 14:17:47 +0100] rev 13538
test-doctest: handle unix/windows path discrepancies
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Mar 2011 10:06:09 +0100] rev 13537
test-rename-merge1: make it easier to review, windows friendly
- Reuse the coding style of the previous tests, both are very similar
- Do not play with case changes, it does not work on Windows
Matt Mackall <mpm@selenic.com> [Sat, 05 Mar 2011 16:34:59 -0600] rev 13536
merge: drop resolve state for mergers with identical contents (issue2680)
Matt Mackall <mpm@selenic.com> [Fri, 04 Mar 2011 19:21:36 -0600] rev 13535
merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 04 Mar 2011 19:21:12 -0600] rev 13534
match: ignore "" patterns
The following command would visit every changeset in repo/ rather than
the last 10:
hg log -l 10 repo/
Adrian Buehlmann <adrian@cadifra.com> [Fri, 18 Feb 2011 01:19:01 +0100] rev 13533
statichttprepo: abort if opener mode is 'r+' or 'rb+'
The old version of the check failed to catch
modifying modes 'r+' and 'rb+'.
Patrick Mezard <pmezard@gmail.com> [Fri, 04 Mar 2011 14:11:15 +0100] rev 13532
Merge with stable
Patrick Mezard <pmezard@gmail.com> [Fri, 04 Mar 2011 14:00:49 +0100] rev 13531
subrepo: handle svn tracked/unknown directory collisions
This happens more often than expected. Say you have an svn subrepository with
python code. Python would have generated unknown .pyc files. Now, you rebase
this setup on a revision where a directory containing python code does not
exist. Subversion is first asked to remove this directory when updating, but
will not because it contains untracked items. Then it will have to bring back
the directory after the merge but will fail because it now collides with an
untracked directory.
Using --force is not very elegant but it is much simpler than rewriting our own
purge command for subversion.
Patrick Mezard <pmezard@gmail.com> [Thu, 03 Mar 2011 22:41:38 +0100] rev 13530
convert/svn: stop using svn bindings when pushing to svn
Patrick Mezard <pmezard@gmail.com> [Thu, 03 Mar 2011 22:19:28 +0100] rev 13529
convert/svn: read trunk name once, use None for default
Patrick Mezard <pmezard@gmail.com> [Thu, 03 Mar 2011 21:42:15 +0100] rev 13528
mq: mention qfinish in qimport help
Steve Borho <steve@borho.org> [Wed, 02 Mar 2011 22:00:41 -0600] rev 13527
merge with stable
Steve Borho <steve@borho.org> [Wed, 02 Mar 2011 21:57:20 -0600] rev 13526
bookmark: fix invalidation of localrepo._bookmarkcurrent
Eric Eisner <ede@mit.edu> [Wed, 02 Mar 2011 12:19:18 -0500] rev 13525
subrepo: show the source that git clones
Martin Geisler <mg@aragost.com> [Wed, 02 Mar 2011 14:52:31 +0100] rev 13524
check-code: catch "echo > $HGRCPATH" too
Make error message consistent with the other error messages.
Martin Geisler <mg@aragost.com> [Wed, 02 Mar 2011 14:23:22 +0100] rev 13523
merge with stable
Martin Geisler <mg@aragost.com> [Wed, 02 Mar 2011 14:22:50 +0100] rev 13522
check-code: better check for overwriting $HGRCPATH
Suggested by Mads Kiilerich on IRC.
Martin Geisler <mg@aragost.com> [Wed, 02 Mar 2011 14:16:11 +0100] rev 13521
test-eol-*: remove unused config settings
Martin Geisler <mg@aragost.com> [Wed, 02 Mar 2011 14:09:06 +0100] rev 13520
mq: forbid commit of merge involving mq patches
Martin Geisler <mg@aragost.com> [Tue, 01 Mar 2011 17:01:17 +0100] rev 13519
tests: don't overwrite HGRCPATH
Overwriting instead of appending to the file removes the [defaults]
section put into the file by run-tests.py.
It also defeats the --inotify option to run-tests.py.
(Nothing was broken yet, but the lack of -d "0 0" cause changeset
hashes to change unexpectedly in a test case I was editing.)
Martin Geisler <mg@aragost.com> [Wed, 02 Mar 2011 13:24:48 +0100] rev 13518
merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 01 Mar 2011 16:01:38 -0600] rev 13517
Added signature for changeset 2616325766e3
Matt Mackall <mpm@selenic.com> [Tue, 01 Mar 2011 16:01:32 -0600] rev 13516
Added tag 1.8 for changeset 2616325766e3
Gilles Moris <gilles.moris@free.fr> [Tue, 01 Mar 2011 07:28:20 +0100] rev 13515
contrib: update tcsh_completion for Mercurial 1.8
Added the following commands: bookmarks debugignore.
Fix the tcsh parse script for the current help text layout.
Matt Mackall <mpm@selenic.com> [Tue, 01 Mar 2011 12:48:31 -0600] rev 13514
merge with i18n
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Tue, 01 Mar 2011 22:44:03 +0900] rev 13513
i18n-ja: synchronized with 0a6bca3d5273
Wagner Bruna <wbruna@yahoo.com> [Tue, 01 Mar 2011 01:00:35 -0300] rev 13512
i18n-pt_BR: synchronized with 9b617c56eb65
Augie Fackler <durin42@gmail.com> [Mon, 28 Feb 2011 19:15:08 -0600] rev 13511
zsh completion: complete bookmarks where they are accepted
This used to work because bookmarks were pseudo-tags, but broke
once bookmarks became their own first-class object.
Mads Kiilerich <mads@kiilerich.com> [Tue, 01 Mar 2011 02:54:16 +0100] rev 13510
tests: test-mq-subrepo.t Solaris 10 sh compliance
Solaris 10 sh do apparently not like temporary environment variable assignment
before a function call. There is no problem with commands.
Kevin Bullock <kbullock@ringworld.org> [Mon, 28 Feb 2011 16:45:15 -0600] rev 13509
bash_completion: complete bookmarks
Since bookmarks moved into core and are no longer merged with the list
of tags (d012d95499f7), they don't get completed in bash_completion
along with other revision specifiers. This adds a new function to
provide the list of bookmarks for completion, and another, _hg_labels(),
to list all tags, branches, and bookmarks. It further modifies
completion for all commands where '_hg_tags; _hg_branches' was used to
use '_hg_labels' instead.
Matt Mackall <mpm@selenic.com> [Mon, 28 Feb 2011 17:41:40 -0600] rev 13508
mq: fix qpush recursion in _findtags when status file is wrong (issue2664)
test from timeless to guard against regressing this
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 11 Feb 2011 13:10:39 +0100] rev 13507
mq: gracefully handle malformated status file
This patch prevent mq to crash when .hg/patches/status contains Malformed lines
(without ":"). Blank lines are ignored and other malformed lines issue a
warning.
Mads Kiilerich <mads@kiilerich.com> [Thu, 24 Feb 2011 00:47:49 +0100] rev 13506
revset: fix typo when assigning weight to reverse and limit
Martin Geisler <mg@aragost.com> [Mon, 28 Feb 2011 15:46:48 +0100] rev 13505
eol: do not abort on parse error
Handle parse errors in the .hgeol similarly to how parse errors in the
.hgtags file are handled: by issuing a warning. This allows the user
to revert the file using 'hg revert' or 'hg update -C'.
Martin Geisler <mg@aragost.com> [Mon, 28 Feb 2011 11:34:51 +0100] rev 13504
eol: fix test typos introduced in 5007ff32f356
Martin Geisler <mg@aragost.com> [Mon, 28 Feb 2011 11:31:36 +0100] rev 13503
eol: test win32text compatible encode/decode filters
Martin Geisler <mg@aragost.com> [Mon, 28 Feb 2011 09:28:18 +0100] rev 13502
eol: be explicit about how to enable hook (issue2661)
Antoine Pitrou <solipsis@pitrou.net> [Sun, 27 Feb 2011 19:50:28 +0100] rev 13501
eol: stop after first matched rule in hook (issue2660)
When matching a file against the rules in .hgeol, the eol extension's
hook should stop after the first matching rule is encountered.
Otherwise, if this rule is contradicted by other more general rule
(for example a catch-all at the end of .hgeol), some files are simply
impossible to push. Trivial example:
**.bat = CRLF
** = LF
If all matching rules were applied, a .bat file would be rejected
either because it has LFs (first rule) or because it has CRLFs (second
rule).
Matt Mackall <mpm@selenic.com> [Sun, 27 Feb 2011 15:58:29 -0600] rev 13500
merge with i18n
Wagner Bruna <wbruna@yahoo.com> [Sat, 26 Feb 2011 18:21:51 -0300] rev 13499
i18n-pt_BR: synchronized with 3178aca36b0f
Adrian Buehlmann <adrian@cadifra.com> [Sun, 27 Feb 2011 12:07:09 +0100] rev 13498
help: document branch template keyword
The branch keyword was added in d79fdff55627
Matt Mackall <mpm@selenic.com> [Sat, 26 Feb 2011 10:40:22 -0600] rev 13497
merge with i18n
Jens Bäckman <jens.backman@gmail.com> [Sat, 26 Feb 2011 16:39:57 +0100] rev 13496
i18n-sv: started translation of mq and patchbomb
Jens Bäckman <jens.backman@gmail.com> [Sat, 26 Feb 2011 16:31:11 +0100] rev 13495
i18n-sv: synchronized with 95b0d4c1c9e1
Pavel Boldin <boldin.pavel@gmail.com> [Fri, 25 Feb 2011 21:01:30 +0300] rev 13494
convert.svn: branch name which equals trunk means `default' branch (issue2653)
Converting from subversion specifying config.svn.trunk results
in storing trunk under branch named as config.svn.trunk, where `default'
brunch is expected. Submission contains patch and test.
Ry4an Brase <ry4an-hg@ry4an.org> [Fri, 25 Feb 2011 23:26:24 -0600] rev 13493
ui: always report untrusted hgrc files when debug enabled
It was suggested in IRC that people disabling the reporting of unstructed hgrc
files can masquerade as problems. This makes sure untrusted hgrc files are
always reported if --debug is used.
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 24 Feb 2011 13:57:52 -0300] rev 13492
tests: test renaming a file added on two branches (issue2089)
The issue was fixed by d100702326d5 .
Matt Mackall <mpm@selenic.com> [Fri, 25 Feb 2011 15:35:01 -0600] rev 13491
merge with i18n
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 25 Feb 2011 22:26:02 +0900] rev 13490
i18n-ja: synchronized with 16725043a6fc
David Soria Parra <dsp@php.net> [Thu, 24 Feb 2011 12:08:40 +0100] rev 13489
i18n-de: translate some bookmark strings
David Soria Parra <dsp@php.net> [Thu, 24 Feb 2011 12:07:42 +0100] rev 13488
i18n-de: synchronized with 703717eb112c
Martin Geisler <mg@aragost.com> [Thu, 24 Feb 2011 12:04:45 +0100] rev 13487
i18n-da: translate some small strings
Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 23 Feb 2011 12:57:09 -0300] rev 13486
i18n-pt_BR: synchronized with 9f2c407caf34
Martin Geisler <mg@aragost.com> [Wed, 23 Feb 2011 15:35:44 +0100] rev 13485
i18n-da: synchronize with 14a699ed774b
Martin Geisler <mg@aragost.com> [Wed, 23 Feb 2011 15:31:49 +0100] rev 13484
i18n: merge with main
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Wed, 23 Feb 2011 23:15:02 +0900] rev 13483
i18n-ja: synchronized with 7458b7e0d8d5
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Wed, 23 Feb 2011 22:52:38 +0900] rev 13482
i18n-ja: synchronized with ba50f1600131
Matt Mackall <mpm@selenic.com> [Fri, 25 Feb 2011 15:31:32 -0600] rev 13481
context: be even more careful about result order in ancestors() (issue2642)
The earlier patch could be confused by more complicated topologies.
Azhagu Selvan SP <tamizhgeek@gmail.com> [Thu, 24 Feb 2011 01:14:15 +0530] rev 13480
convert/svn: abort operation when python bindings are not available
Subversion python bindings check was not present in svn_sink source
class which made it fail while using svn as destination repository.
Added a more maintainble svn bindings check for svn_source and svn_sink
classes.
Azhagu Selvan SP <tamizhgeek@gmail.com> [Thu, 24 Feb 2011 00:45:02 +0530] rev 13479
convert/svn: handle MissingTool exception from converter_sink class
The converter_sink class had no way of handling MissingTool
exception. This change makes it to abort when there is a
MissingTool exception.
David Soria Parra <dsp@php.net> [Thu, 24 Feb 2011 14:38:50 +0100] rev 13478
bookmarks: restrict moving a bookmark to its descendants (issue1502)
A bookmark can only move to a descendant on commit, pull or
unbundle. Bookmarks cannot jump between heads anymore. This fixese
issue 1502.
We explicitly use new.node(), to emphasise that we are updating the
current bookmark to the new node.
Kevin Bullock <kbullock@ringworld.org> [Fri, 18 Feb 2011 17:09:08 -0600] rev 13477
id: add bookmarks to id
Since bookmarks are no longer merged with repo.tags() as of
d012d95499f7, they don't show up in `hg id` as they used to. This adds
them back into the summary that `hg id` prints, and adds a
-B/--bookmarks flag alongside the -t/--tags and -b/--branch options.
Note this introduces a slight backwards-incompatibility: the summary
printed by `hg id` now separates bookmarks from tags with a space, as
seen below, instead of running it into the tags list.
Default summary output:
$ hg id
db815d6d32e6 tip/tag1 bm1/bm2
Output with --bookmarks:
$ hg id --bookmarks
bm1 bm2
See also afc84a879ac8 which adds bookmarks back into `hg summary`.
Kevin Bullock <kbullock@ringworld.org> [Wed, 23 Feb 2011 20:47:00 -0600] rev 13476
workingctx: overload bookmarks() to return parents' bookmarks
This implements workingctx.bookmarks() parallel to workingctx.tags(),
overloading the implementation from changectx.
Martin Geisler <mg@aragost.com> [Fri, 25 Feb 2011 12:32:15 +0100] rev 13475
eol: handle LockUnavailable error (issue2569)
If the repository is not locked when clearing the dirstate, then
running test-eol.t in a loop fails sooner or later with:
ERROR: /home/mg/src/mercurial-crew/tests/test-eol.t output changed
--- /home/mg/src/mercurial-crew/tests/test-eol.t
+++ /home/mg/src/mercurial-crew/tests/test-eol.t.err
@@ -343,6 +343,7 @@
% hg status (eol activated)
M win.txt
% hg commit
+ nothing changed
% hg status
$ testmixed CRLF
However, if we cannot lock the repository, then we can also not make a
commit and so we can simply ignore a LockUnavailable error.
David Soria Parra <dsp@php.net> [Thu, 24 Feb 2011 19:15:00 +0100] rev 13474
tests: check if the bookmarks extension is ignored
Jonathan Nieder <jrnieder@gmail.com> [Fri, 11 Feb 2011 21:17:27 -0600] rev 13473
backout: clarify which changesets are new in help text
Plus another wording tweak ("default behavior -> "behavior without
--merge").
Suggested by Kevin Bullock.
Martin Geisler <mg@aragost.com> [Fri, 25 Feb 2011 11:39:19 +0100] rev 13472
commands: update year to 2011 in version string
Martin Geisler <mg@aragost.com> [Fri, 25 Feb 2011 10:52:37 +0100] rev 13471
eol: clarify where the .hgeol file is located
Martin Geisler <mg@aragost.com> [Thu, 24 Feb 2011 15:35:22 +0100] rev 13470
commands: mark strings for translation
David Soria Parra <dsp@php.net> [Thu, 24 Feb 2011 03:13:48 +0100] rev 13469
tests: remove bookmark extension configuration
Matt Mackall <mpm@selenic.com> [Wed, 23 Feb 2011 17:27:05 -0600] rev 13468
context: generate file ancestors in reverse revision order (issue2642)
The related() function in copies assumes that revisions are generated
in reverse revision order, so it was getting confused in some situations.
Waqas Hussain <waqas20@gmail.com> [Wed, 23 Feb 2011 13:21:55 +0500] rev 13467
export: only close files which export itself has opened
Eric Eisner <ede@mit.edu> [Wed, 23 Feb 2011 10:59:36 -0500] rev 13466
subrepo: only attempt pulling from git's origin
git fetch does not accept repository URLs as arguments, and the intended
logic of this code was not actually doing anything.
Eric Eisner <ede@mit.edu> [Wed, 23 Feb 2011 10:17:44 -0500] rev 13465
subrepo: disallow all unknown git ref types
Adrian Buehlmann <adrian@cadifra.com> [Wed, 23 Feb 2011 11:42:41 +0100] rev 13464
sshrepo: catch passwords in ssh urls
see also e4b02eb825b1
David Soria Parra <dsp@php.net> [Wed, 23 Feb 2011 00:25:18 +0100] rev 13463
hgk: display bookmark in commit diff window
David Soria Parra <dsp@php.net> [Wed, 23 Feb 2011 00:25:01 +0100] rev 13462
hgk: display bookmarks as gray labels in the commitline
David Soria Parra <dsp@php.net> [Wed, 23 Feb 2011 00:24:21 +0100] rev 13461
hgk: read bookmarks
Eric Eisner <ede@mit.edu> [Tue, 22 Feb 2011 15:11:10 -0500] rev 13460
subrepo: expand relative sources for git subrepos
Jim Hague <jim.hague@acm.org> [Tue, 22 Feb 2011 16:31:01 +0100] rev 13459
changegroup: fix typo introduced in 9f2c407caf34
Mads Kiilerich <mads@kiilerich.com> [Tue, 22 Feb 2011 03:10:37 +0100] rev 13458
changegroup: don't accept odd chunk headers
Mads Kiilerich <mads@kiilerich.com> [Tue, 22 Feb 2011 03:03:39 +0100] rev 13457
changegroup: verify all stream reads
Mercurial often failed with struct.error or mpatch.mpatchError if incomplete
data was received from a server.
Now we validate all changegroup reads and aborts with
abort: stream ended unexpectedly (got %d bytes, expected %d)
if less than requested was read.
Mads Kiilerich <mads@kiilerich.com> [Tue, 22 Feb 2011 03:02:50 +0100] rev 13456
changegroup: don't accept streams without proper termination
Streams should be terminated with a zero size changegroup, and read should
never be permitted to return less than requested.
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 21 Feb 2011 20:58:54 -0300] rev 13455
rollback, i18n: avoid parameterized message
David Soria Parra <dsp@php.net> [Mon, 21 Feb 2011 23:27:45 +0100] rev 13454
summary: add bookmarks to summary
David Soria Parra <dsp@php.net> [Mon, 21 Feb 2011 22:22:12 +0100] rev 13453
bookmarks: issue a warning if remote doesn't support comparing bookmarks
We want to issue a warning and abort comparing bookmarks if remote doesn't
support it. Otherwise hg out -B will list you outgoing bookmarks that cannot
be pushed to the remote repository using hg push -B.
Matt Mackall <mpm@selenic.com> [Mon, 21 Feb 2011 11:24:23 -0600] rev 13452
merge with i18n
Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 16 Feb 2011 22:42:03 -0200] rev 13451
i18n-pt_BR: synchronized with ed720c7cc97d
David Soria Parra <dsp@php.net> [Mon, 21 Feb 2011 00:37:55 +0100] rev 13450
wireproto: catch possible cast error in pushkey
The server can return an unexpected answer like 'ssl required'. We catch those
possible cast errors and abort the operation.
Gilles Moris <gilles.moris@free.fr> [Sun, 20 Feb 2011 18:06:05 +0100] rev 13449
test-push-http: use killdaemons.py instead of kill to avoid test unreliability
David Soria Parra <dsp@php.net> [Sun, 20 Feb 2011 00:57:55 +0100] rev 13448
bookmarks: mark new bookmark as current if it points to the current dirstate
hg bookmark -r ancestorrev X will not mark X as the current bookmark anymore.
If you want to point a bookmark to a ancestor rev you will use hg update to
move to it. This will set the current bookmark.
Adrian Buehlmann <adrian@cadifra.com> [Fri, 18 Feb 2011 20:25:25 +0100] rev 13447
introduce new RequirementError (issue2649)
This improves the misleading error message
$ hg identify
abort: there is no Mercurial repository here (.hg not found)!
to the more explicit
$ hg identify
abort: requirement 'fake' not supported!
for all commands in commands.optionalrepo, which includes the identify
and serve commands in particular.
This is for the case when a new entry in .hg/requires will be defined
in a future Mercurial release.
Gilles Moris <gilles.moris@free.fr> [Thu, 10 Feb 2011 09:03:06 +0100] rev 13446
rollback: clarifies the message about the reverted state (issue2628)
Previously, when rolling back a transaction, some users could be confused
between the level to which the store is rolled back, and the new parents
of the working directory.
$ hg rollback
rolling back to revision 4 (undo commit)
With this change:
$ hg rollback
repository tip rolled back to tip revision 4 (undo commit)
working directory now based on revision 2 and 1
So now the user can realize that the store has been rolled back to an older
tip, but also that the working directory may not on the tip (here we are
rolling back the merge of the heads 2 and 1)
Mads Kiilerich <mads@kiilerich.com> [Mon, 21 Feb 2011 00:57:19 +0100] rev 13445
hgweb: handle invalid requests with both form data and querystring
Invalid requests could give an unhandled ErrorResponse.
Now this ErrorResponse is handled like other ErrorResponses so the client gets
an error message which also is logged on the server.
Mads Kiilerich <mads@kiilerich.com> [Mon, 21 Feb 2011 00:52:26 +0100] rev 13444
hgweb: give ErrorResponse a descriptive string/Exception representation
Very handy if the exception should appear in output.
Mads Kiilerich <mads@kiilerich.com> [Mon, 21 Feb 2011 00:52:23 +0100] rev 13443
serve: catch and log all Exceptions, not only StandardException
Other exceptions than StandardExceptions were left to the default error handler
which was muted when running in daemon mode.
Now all Exceptions are handled and logged to the log file.
Martin Geisler <mg@lazybytes.net> [Sun, 20 Feb 2011 13:35:30 +0100] rev 13442
test-i18n: make test conditional on msgfmt availability
Steve Borho <steve@borho.org> [Fri, 18 Feb 2011 10:28:20 -0600] rev 13441
match: fix subtle error in _buildmatch
The trailing comma was causing a ValueError. See
https://bitbucket.org/tortoisehg/thg/issue/132
Mads Kiilerich <mads@kiilerich.com> [Fri, 18 Feb 2011 23:41:13 +0100] rev 13440
statichttprepo: don't modify localrepo class variables
This happened to crash in subrepo setups when the base class variable was
modified twice.
Now we don't modify the class variable but an instance copy.
Mads Kiilerich <mads@kiilerich.com> [Fri, 18 Feb 2011 03:35:01 +0100] rev 13439
util: flush stdout before calling external processes
stdout could have content in its buffer while a subprocess ran and emitted
output.
Flushing stdout ensures that output now comes in the right order.
Mads Kiilerich <mads@kiilerich.com> [Fri, 18 Feb 2011 03:34:47 +0100] rev 13438
tests: update test-https.t output
I must have lost the insecure cert warning in a last minute patch series
cleanup of 08f9c587141f.
Oleg Stepanov <oleg.stepanov@jetbrains.com> [Wed, 16 Feb 2011 08:56:11 -0800] rev 13437
Do not allow merging with uncommitted changes in a subrepo
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 17 Feb 2011 18:05:27 -0200] rev 13436
hgwebdir: reduce memory usage for index generation
The archive list generator was holding a reference to each
temporary ui copy passed by rawentries(), so the memory
usage for index generation growed proportionally to the
ui object size and the amount of repositories. By returning a
list instead, the temporary reference is dropped immediately.
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 17 Feb 2011 13:37:52 -0200] rev 13435
pure: fix index parsing on empty repositories
Steve Losh <steve@stevelosh.com> [Thu, 17 Feb 2011 17:15:32 -0500] rev 13434
alias: add test cases for $ escaping in shell aliases
Augie Fackler <durin42@gmail.com> [Wed, 16 Feb 2011 17:36:31 -0600] rev 13433
bookmarks: verify switching bookmarks works properly
Martin Geisler <mg@aragost.com> [Thu, 17 Feb 2011 09:20:44 +0100] rev 13432
subrepo: break long line found by check-code
Martin Geisler <mg@aragost.com> [Thu, 17 Feb 2011 09:19:15 +0100] rev 13431
test-convert: update output to match 0079fb98e8d0
Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 16 Feb 2011 21:02:41 -0200] rev 13430
dispatch: fix typo in debug message
Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 16 Feb 2011 21:02:19 -0200] rev 13429
convert: fix typos in docstring
Kevin Bullock <kbullock@ringworld.org> [Wed, 16 Feb 2011 11:53:48 -0600] rev 13428
subrepos: print short git changeset ids
This changes the prompts on git subrepos to show only the first seven
digits of git changeset IDs (as git's command line does):
$ hg update
subrepository sources for s differ (in checked out version)
use (l)ocal source (32a3438) or (r)emote source (da5f5b1)?
Matt Mackall <mpm@selenic.com> [Wed, 16 Feb 2011 14:13:22 -0600] rev 13427
merge default into stable for 1.8 code freeze
Adrian Buehlmann <adrian@cadifra.com> [Wed, 16 Feb 2011 15:02:30 +0100] rev 13426
store: remove pointless pathjoiner parameter
We can stop pretending that we have to support anything else
than '/' for concatenating path elements anywhere.
Windows deals just fine with '/' in file paths and we already
have plenty of places which produce paths containing '/'
anyway when running on Windows.
David Soria Parra <dsp@php.net> [Wed, 16 Feb 2011 18:36:45 +0100] rev 13425
bookmarks: forbid \0 \r \n : in bookmark names (BC)
We restrict : to 1. make it easer to convert bookmarks to git branches,
2. use : later for a syntax to push a local bookmark to a remote bookmark
of a different name. \0, \n, \r are fobbidden they are used to separate
bookmarks in the bookmark file.
This change breaks backward compatbility as ':' was an allowed character in
previous versions.
Mads Kiilerich <mads@kiilerich.com> [Wed, 16 Feb 2011 04:36:36 +0100] rev 13424
url: merge BetterHTTPS with httpsconnection to get some proxy https validation
Mads Kiilerich <mads@kiilerich.com> [Wed, 16 Feb 2011 04:28:11 +0100] rev 13423
tests: test https through http proxy
These tests fails for me with Python 2.6(.nothing)
Mads Kiilerich <mads@kiilerich.com> [Wed, 16 Feb 2011 04:28:17 +0100] rev 13422
url: always create BetterHTTPS connections the same way
Mads Kiilerich <mads@kiilerich.com> [Wed, 16 Feb 2011 04:28:17 +0100] rev 13421
url: refactor BetterHTTPS.connect
Mads Kiilerich <mads@kiilerich.com> [Wed, 16 Feb 2011 04:28:17 +0100] rev 13420
url: refactor _gen_sendfile
Mads Kiilerich <mads@kiilerich.com> [Wed, 16 Feb 2011 04:28:17 +0100] rev 13419
url: remove test for self.ui in BetterHTTPS
We use self.ui unconditionally anyway so we would have noticed if it in some
cases wasn't set.
Mads Kiilerich <mads@kiilerich.com> [Wed, 16 Feb 2011 03:28:22 +0100] rev 13418
tests: update ssl requirement for test-https.t
hgweb requires OpenSSL for serving https.
Erik Zielke <ez@aragost.com> [Wed, 09 Feb 2011 10:53:09 +0100] rev 13417
subrepos: prompt on conflicts on update with dirty subrepos
Consider a repository with a single subrepository. The changesets in
the main repository reference the subrepository changesets like this:
m0 -> s0
m1 -> s1
m2 -> s2
Starting from a state (m1, s0), doing 'hg update m2' in the main
repository will yield a conflict: the subrepo is at revision s0 but
the target revision says it should be at revision s2.
Before this change, Mercurial would do (m1, s0) -> (m2, s2) and thus
ignore the conflict between the working copy and the target revision.
With this change, the user is prompted to resolve the conflict by
choosing which revision he wants. This is consistent with 'hg merge',
which also prompts the user when it detects conflicts in the merged
.hgsubstate files.
The prompt looks like this:
$ hg update tip
subrepository sources for my-subrepo differ
use (l)ocal source (fc627a69481f) or (r)emote source (12a213df6fa9)?
David Soria Parra <dsp@php.net> [Wed, 16 Feb 2011 01:29:26 +0100] rev 13416
bookmarks: make track.current=True default behaviour and remove option (BC)
David Soria Parra <dsp@php.net> [Wed, 16 Feb 2011 01:28:42 +0100] rev 13415
update: preserve possible bookmark name to set current bookmark correctly